diff --git a/manifest b/manifest
index e8516c64fd..8bc65f07d1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Performance\simprovement\sin\ssqlite3ExprDelete().
-D 2016-04-11T14:49:39.785
+C Rename\sthe\sOP_MX_JUMP\smacro\sto\sSQLITE_MX_JUMP_OPCODE\sto\savoid\sconfusing\sthe\nopcode\sname\sgenerator.
+D 2016-04-11T16:35:05.793
 F Makefile.in eba680121821b8a60940a81454316f47a341487a
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 1f123a0757f6f04f0341accb46457e116817159a
@@ -445,7 +445,7 @@ F src/vdbe.c d3843a66d74a7696477ee5141e5eb9a7e5e2401c
 F src/vdbe.h 5591b5add447096e31288b5a0a78ec5d7b5c5170
 F src/vdbeInt.h ddb157974436d87652de7dc641f7191496d9a8cd
 F src/vdbeapi.c ba85b78fe08dc4a9ce747e62c89a2b4a4547e74c
-F src/vdbeaux.c b0bd706639fda1ee3aa786b3a01a798e13e811d4
+F src/vdbeaux.c ace1875da40b7185e604586768d5ac90de7e4f7f
 F src/vdbeblob.c c9f2f494b911c6fa34efd9803f0a10807da80f77
 F src/vdbemem.c 5cfef60e60e19cab6275d1b975bf4c791d575beb
 F src/vdbesort.c 307460bfa4de4d1c3901fcd42089159131e34062
@@ -1420,7 +1420,7 @@ F tool/mkautoconfamal.sh e855df211ecbcc7131dee817110ff386cfb112f7
 F tool/mkkeywordhash.c f7f3b342211ac6a14258b9726d5b97cf4f548f22
 F tool/mkmsvcmin.tcl 2f12f7fa8858bbe61cf81820a2da96c79ed1ca8d
 F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
-F tool/mkopcodeh.tcl 3b1ee0fd2452b0e2c0381956269a9ac3788255a3
+F tool/mkopcodeh.tcl a01d2c1d8a6205b03fc635adf3735b4c523befd3
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
 F tool/mkpragmatab.tcl f0d5bb266d1d388cf86fce5ba01a891e95d72d41
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
@@ -1482,7 +1482,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 099478fa7521ba52262ef2bf24dd8f0114ce92e1
-R 5159c43d8f5df7b2df207c9931eea763
+P 60ad80e3af4bae9f5c74fedf09eec9689e2e3dbf
+R f6edf7124a508a9e875e2a5fe8999259
 U drh
-Z 20edece30066cfe56abf703e4a6fcff0
+Z 1a9da7914d71f57fbfab1a0d0fb98803
diff --git a/manifest.uuid b/manifest.uuid
index fd8709802d..d8dad99228 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-60ad80e3af4bae9f5c74fedf09eec9689e2e3dbf
\ No newline at end of file
+e554a4c38bda9c73bf129bb7c665c53ccc4d96a8
\ No newline at end of file
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index d3f2b6b7bc..0f9dab8e19 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -564,9 +564,9 @@ static void resolveP2Values(Vdbe *p, int *pMaxFuncArgs){
     ** below need to be considered.  The mkopcodeh.tcl generator script groups
     ** all these opcodes together near the front of the opcode list.  Skip
     ** any opcode that does not need processing by virtual of the fact that
-    ** it is larger than OP_MX_JUMP, as a performance optimization.
+    ** it is larger than SQLITE_MX_JUMP_OPCODE, as a performance optimization.
     */
-    if( pOp->opcode<=OP_MX_JUMP ){
+    if( pOp->opcode<=SQLITE_MX_JUMP_OPCODE ){
       /* NOTE: Be sure to update mkopcodeh.tcl when adding or removing
       ** cases from this switch! */
       switch( pOp->opcode ){
diff --git a/tool/mkopcodeh.tcl b/tool/mkopcodeh.tcl
index c3dfc1cd4d..3c2a59789c 100644
--- a/tool/mkopcodeh.tcl
+++ b/tool/mkopcodeh.tcl
@@ -260,4 +260,4 @@ puts "** JUMP opcode the better, so the mkopcodeh.tcl script that"
 puts "** generated this include file strives to group all JUMP opcodes"
 puts "** together near the beginning of the list."
 puts "*/"
-puts "#define OP_MX_JUMP  $mxJump  /* Maximum JUMP opcode */"
+puts "#define SQLITE_MX_JUMP_OPCODE  $mxJump  /* Maximum JUMP opcode */"