diff --git a/apf2java/apf2java.out b/apf2java/apf2java.out
index a79146e..a3aa349 100644
--- a/apf2java/apf2java.out
+++ b/apf2java/apf2java.out
@@ -7,35 +7,35 @@
         gen.addStoreData(R0, 0);
         gen.addLoad16(R0, 12);
         gen.addLoadImmediate(R1, -120);
-        gen.addJumpIfR0LessThan(0x600, "LABEL_582");
+        gen.addJumpIfR0LessThan(0x600, "LABEL_INC_AND_DROP");
         gen.addLoadImmediate(R1, -124);
-        gen.addJumpIfR0Equals(0x88a2, "LABEL_582");
-        gen.addJumpIfR0Equals(0x88a4, "LABEL_582");
-        gen.addJumpIfR0Equals(0x88b8, "LABEL_582");
-        gen.addJumpIfR0Equals(0x88cd, "LABEL_582");
-        gen.addJumpIfR0Equals(0x88e1, "LABEL_582");
-        gen.addJumpIfR0Equals(0x88e3, "LABEL_582");
+        gen.addJumpIfR0Equals(0x88a2, "LABEL_INC_AND_DROP");
+        gen.addJumpIfR0Equals(0x88a4, "LABEL_INC_AND_DROP");
+        gen.addJumpIfR0Equals(0x88b8, "LABEL_INC_AND_DROP");
+        gen.addJumpIfR0Equals(0x88cd, "LABEL_INC_AND_DROP");
+        gen.addJumpIfR0Equals(0x88e1, "LABEL_INC_AND_DROP");
+        gen.addJumpIfR0Equals(0x88e3, "LABEL_INC_AND_DROP");
         gen.addJumpIfR0NotEquals(0x806, "LABEL_122");
         gen.addLoadImmediate(R0, 14);
         gen.addLoadImmediate(R1, -152);
-        gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("000108000604"), "LABEL_582");
+        gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("000108000604"), "LABEL_INC_AND_DROP");
         gen.addLoad16(R0, 20);
         gen.addJumpIfR0Equals(0x1, "LABEL_104");
         gen.addLoadImmediate(R1, -156);
-        gen.addJumpIfR0NotEquals(0x2, "LABEL_582");
+        gen.addJumpIfR0NotEquals(0x2, "LABEL_INC_AND_DROP");
         gen.addLoad32(R0, 28);
         gen.addLoadImmediate(R1, -128);
-        gen.addJumpIfR0Equals(0x0, "LABEL_582");
+        gen.addJumpIfR0Equals(0x0, "LABEL_INC_AND_DROP");
         gen.addLoadImmediate(R0, 0);
         gen.addLoadImmediate(R1, -56);
-        gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("ffffffffffff"), "LABEL_576");
+        gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("ffffffffffff"), "LABEL_INC_AND_PASS");
 
         gen.defineLabel("LABEL_104");
         gen.addLoadImmediate(R0, 38);
         gen.addLoadImmediate(R1, -80);
-        gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("c0a801ec"), "LABEL_582");
+        gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("c0a801ec"), "LABEL_INC_AND_DROP");
         gen.addLoadImmediate(R1, -20);
-        gen.addJump("LABEL_576");
+        gen.addJump("LABEL_INC_AND_PASS");
 
         gen.defineLabel("LABEL_122");
         gen.addLoad16(R0, 12);
@@ -51,18 +51,18 @@
         gen.addAddR1();
         gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("7e9046bc7008"), "LABEL_165");
         gen.addLoadImmediate(R1, -24);
-        gen.addJump("LABEL_576");
+        gen.addJump("LABEL_INC_AND_PASS");
 
         gen.defineLabel("LABEL_165");
         gen.addLoad8(R0, 30);
         gen.addAnd(240);
         gen.addLoadImmediate(R1, -96);
-        gen.addJumpIfR0Equals(0xe0, "LABEL_582");
+        gen.addJumpIfR0Equals(0xe0, "LABEL_INC_AND_DROP");
         gen.addLoadImmediate(R1, -88);
         gen.addLoad32(R0, 30);
-        gen.addJumpIfR0Equals(0xffffffff, "LABEL_582");
+        gen.addJumpIfR0Equals(0xffffffff, "LABEL_INC_AND_DROP");
         gen.addLoadImmediate(R1, -92);
-        gen.addJumpIfR0Equals(0xc0a801ff, "LABEL_582");
+        gen.addJumpIfR0Equals(0xc0a801ff, "LABEL_INC_AND_DROP");
         gen.addLoad8(R0, 23);
         gen.addJumpIfR0NotEquals(0x6, "LABEL_225");
         gen.addLoad16(R0, 20);
@@ -71,101 +71,101 @@
         gen.addLoad16Indexed(R0, 16);
         gen.addJumpIfR0NotEquals(0x7, "LABEL_225");
         gen.addLoadImmediate(R1, -148);
-        gen.addJump("LABEL_582");
+        gen.addJump("LABEL_INC_AND_DROP");
 
         gen.defineLabel("LABEL_225");
         gen.addLoadImmediate(R1, -36);
         gen.addLoadImmediate(R0, 0);
-        gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("ffffffffffff"), "LABEL_576");
+        gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("ffffffffffff"), "LABEL_INC_AND_PASS");
         gen.addLoadImmediate(R1, -84);
-        gen.addJump("LABEL_582");
+        gen.addJump("LABEL_INC_AND_DROP");
         gen.addLoadImmediate(R1, -28);
-        gen.addJump("LABEL_576");
+        gen.addJump("LABEL_INC_AND_PASS");
 
         gen.defineLabel("LABEL_249");
         gen.addJumpIfR0Equals(0x86dd, "LABEL_273");
         gen.addLoadImmediate(R0, 0);
         gen.addLoadImmediate(R1, -60);
-        gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("ffffffffffff"), "LABEL_576");
+        gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("ffffffffffff"), "LABEL_INC_AND_PASS");
         gen.addLoadImmediate(R1, -68);
-        gen.addJump("LABEL_582");
+        gen.addJump("LABEL_INC_AND_DROP");
 
         gen.defineLabel("LABEL_273");
         gen.addLoad8(R0, 20);
-        gen.addJumpIfR0Equals(0x0, "LABEL_576");
+        gen.addJumpIfR0Equals(0x0, "LABEL_INC_AND_PASS");
         gen.addJumpIfR0Equals(0x3a, "LABEL_297");
         gen.addLoadImmediate(R1, -116);
         gen.addLoad8(R0, 38);
-        gen.addJumpIfR0Equals(0xff, "LABEL_582");
+        gen.addJumpIfR0Equals(0xff, "LABEL_INC_AND_DROP");
         gen.addLoadImmediate(R1, -44);
-        gen.addJump("LABEL_576");
+        gen.addJump("LABEL_INC_AND_PASS");
 
         gen.defineLabel("LABEL_297");
         gen.addLoad8(R0, 54);
         gen.addLoadImmediate(R1, -100);
-        gen.addJumpIfR0Equals(0x85, "LABEL_582");
+        gen.addJumpIfR0Equals(0x85, "LABEL_INC_AND_DROP");
         gen.addJumpIfR0NotEquals(0x88, "LABEL_333");
         gen.addLoadImmediate(R0, 38);
         gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("ff0200000000000000000000000000"), "LABEL_333");
         gen.addLoadImmediate(R1, -104);
-        gen.addJump("LABEL_582");
+        gen.addJump("LABEL_INC_AND_DROP");
 
         gen.defineLabel("LABEL_333");
         gen.addLoadFromMemory(R0, 14);
-        gen.addJumpIfR0NotEquals(0x96, "LABEL_574");
+        gen.addJumpIfR0NotEquals(0x96, "LABEL_UNSOLICITED_MULTICAST_NA");
         gen.addLoadFromMemory(R0, 15);
-        gen.addJumpIfR0GreaterThan(0x48e, "LABEL_574");
+        gen.addJumpIfR0GreaterThan(0x48e, "LABEL_UNSOLICITED_MULTICAST_NA");
         gen.addLoadImmediate(R0, 0);
-        gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("7e9046bc700828c68e23672c86dd60"), "LABEL_574");
+        gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("7e9046bc700828c68e23672c86dd60"), "LABEL_UNSOLICITED_MULTICAST_NA");
         gen.addLoadImmediate(R0, 18);
-        gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("00603afffe800000000000002ac68efffe23672c"), "LABEL_574");
+        gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("00603afffe800000000000002ac68efffe23672c"), "LABEL_UNSOLICITED_MULTICAST_NA");
         gen.addLoadImmediate(R0, 54);
-        gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("8600"), "LABEL_574");
+        gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("8600"), "LABEL_UNSOLICITED_MULTICAST_NA");
         gen.addLoadImmediate(R0, 58);
-        gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("40c0"), "LABEL_574");
+        gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("40c0"), "LABEL_UNSOLICITED_MULTICAST_NA");
         gen.addLoad16(R0, 60);
-        gen.addJumpIfR0Equals(0x0, "LABEL_574");
+        gen.addJumpIfR0Equals(0x0, "LABEL_UNSOLICITED_MULTICAST_NA");
         gen.addJumpIfR0LessThan(0xb4, "LABEL_421");
-        gen.addJumpIfR0LessThan(0x91e, "LABEL_574");
-        gen.addJumpIfR0GreaterThan(0x1b58, "LABEL_574");
+        gen.addJumpIfR0LessThan(0x91e, "LABEL_UNSOLICITED_MULTICAST_NA");
+        gen.addJumpIfR0GreaterThan(0x1b58, "LABEL_UNSOLICITED_MULTICAST_NA");
 
         gen.defineLabel("LABEL_421");
         gen.addLoadImmediate(R0, 62);
-        gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("0000000000000000010128c68e23672c05010000000005dc030440c0"), "LABEL_574");
+        gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("0000000000000000010128c68e23672c05010000000005dc030440c0"), "LABEL_UNSOLICITED_MULTICAST_NA");
         gen.addLoad32(R0, 90);
-        gen.addJumpIfR0Equals(0x0, "LABEL_574");
+        gen.addJumpIfR0Equals(0x0, "LABEL_UNSOLICITED_MULTICAST_NA");
         gen.addJumpIfR0LessThan(0xb4, "LABEL_480");
-        gen.addJumpIfR0LessThan(0x55555555, "LABEL_574");
-        gen.addJumpIfR0GreaterThan(0xffffffffL, "LABEL_574");
+        gen.addJumpIfR0LessThan(0x55555555, "LABEL_UNSOLICITED_MULTICAST_NA");
+        gen.addJumpIfR0GreaterThan(0xffffffffL, "LABEL_UNSOLICITED_MULTICAST_NA");
 
         gen.defineLabel("LABEL_480");
         gen.addLoad32(R0, 94);
-        gen.addJumpIfR0LessThan(0x55555555, "LABEL_574");
-        gen.addJumpIfR0GreaterThan(0xffffffffL, "LABEL_574");
+        gen.addJumpIfR0LessThan(0x55555555, "LABEL_UNSOLICITED_MULTICAST_NA");
+        gen.addJumpIfR0GreaterThan(0xffffffffL, "LABEL_UNSOLICITED_MULTICAST_NA");
         gen.addLoadImmediate(R0, 98);
-        gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("000000002401fa000480f000000000000000000019030000"), "LABEL_574");
+        gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("000000002401fa000480f000000000000000000019030000"), "LABEL_UNSOLICITED_MULTICAST_NA");
         gen.addLoad32(R0, 122);
-        gen.addJumpIfR0Equals(0x0, "LABEL_574");
+        gen.addJumpIfR0Equals(0x0, "LABEL_UNSOLICITED_MULTICAST_NA");
         gen.addJumpIfR0LessThan(0x78, "LABEL_547");
-        gen.addJumpIfR0LessThan(0x91e, "LABEL_574");
-        gen.addJumpIfR0GreaterThan(0x1b58, "LABEL_574");
+        gen.addJumpIfR0LessThan(0x91e, "LABEL_UNSOLICITED_MULTICAST_NA");
+        gen.addJumpIfR0GreaterThan(0x1b58, "LABEL_UNSOLICITED_MULTICAST_NA");
 
         gen.defineLabel("LABEL_547");
         gen.addLoadImmediate(R0, 126);
-        gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("2401fa000480f00000000000000000010701"), "LABEL_574");
+        gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("2401fa000480f00000000000000000010701"), "LABEL_UNSOLICITED_MULTICAST_NA");
         gen.addLoadImmediate(R1, -72);
-        gen.addJump("LABEL_582");
+        gen.addJump("LABEL_INC_AND_DROP");
 
-        gen.defineLabel("LABEL_574");
+        gen.defineLabel("LABEL_UNSOLICITED_MULTICAST_NA");
         gen.addLoadImmediate(R1, -40);
 
-        gen.defineLabel("LABEL_576");
+        gen.defineLabel("LABEL_INC_AND_PASS");
         gen.addLoadData(R0, 0);
         gen.addAdd(1);
         gen.addStoreData(R0, 0);
         gen.addJump(PASS_LABEL);
 
-        gen.defineLabel("LABEL_582");
+        gen.defineLabel("LABEL_INC_AND_DROP");
         gen.addLoadData(R0, 0);
         gen.addAdd(1);
         gen.addStoreData(R0, 0);
diff --git a/apf2java/apf2java.sh b/apf2java/apf2java.sh
index e5e716c..77f1c6f 100755
--- a/apf2java/apf2java.sh
+++ b/apf2java/apf2java.sh
@@ -37,9 +37,16 @@
   sed -r "s@^( +${L}:)@\ngen.defineLabel(LABEL_${L});\n\1@" < tmp > tmp2
   cat tmp2 > tmp
 done
-sed -r 's@^ +[0-9]+: @@' < tmp > tmp2
-cat tmp2 > tmp
-sed -r 's@(LABEL_[0-9]+)@"\1"@' < tmp > tmp2
+
+sed -r \
+'s@^ +[0-9]+: @@;'\
+'s@(LABEL_[0-9]+)@"\1"@;'\
+"s@\"LABEL_${LABELS[-1]}\"@\"LABEL_INC_AND_DROP\"@;"\
+"s@\"LABEL_${LABELS[-2]}\"@\"LABEL_INC_AND_PASS\"@;"\
+"s@\"LABEL_${LABELS[-3]}\"@\"LABEL_UNSOLICITED_MULTICAST_NA\"@;"\
+< tmp > tmp2
+# The above label renames are based on what our current generator emits as prologue.
+
 if [[ "$(egrep -v '^$|gen' < tmp2 | wc -l)" != 0 ]]; then
   echo 'Failure to translate:'
   egrep -v '^$|gen' < tmp2