diff --git a/Makefile.in b/Makefile.in
index 5137d596da..780d9d9c6c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -69,11 +69,11 @@ TLIBS = @LIBS@
 
 # Flags controlling use of the in memory btree implementation
 #
-# TEMP_STORE is 0 to force temporary tables to be in a file, 1 to
+# SQLITE_TEMP_STORE is 0 to force temporary tables to be in a file, 1 to
 # default to file, 2 to default to memory, and 3 to force temporary
 # tables to always be in memory.
 #
-TEMP_STORE = -DTEMP_STORE=@TEMP_STORE@
+TEMP_STORE = -DSQLITE_TEMP_STORE=@TEMP_STORE@
 
 # Enable/disable loadable extensions based on configuration
 TCC += @LOADEXTENSION_FLAGS@
diff --git a/manifest b/manifest
index 10c52d0f08..b127b2b707 100644
--- a/manifest
+++ b/manifest
@@ -1,7 +1,7 @@
-C Change\sthe\sOS_XXX\spre-processor\ssymbols\sto\sSQLITE_OS_XXX.\sSymbols\s"OS_UNIX",\s"OS_WIN",\s"OS_WINCE",\s"OS_OS2"\sand\s"OS_OTHER"\sare\snow\s"SQLITE_OS_UNIX",\s"SQLITE_OS_WIN",\s"SQLITE_OS_WINCE",\s"SQLITE_OS_OS2"\sand\s"SQLITE_OS_OTHER",\srespectively.\s(CVS\s5311)
-D 2008-06-26T10:41:19
+C Change\sthe\sTEMP_STORE\spreprocessor\ssymbol\sto\sSQLITE_TEMP_STORE.\s(CVS\s5312)
+D 2008-06-26T10:54:12
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
-F Makefile.in dcf0ecf664a31c257f540d32e5d69a09edf962f0
+F Makefile.in 325dfac0a0dd1cb4d975f1ace6453157892e6042
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
 F README b974cdc3f9f12b87e851b04e75996d720ebf81ac
 F VERSION d739ba532eddc5c09ef9a55151328cd6a8a102c6
@@ -114,7 +114,7 @@ F src/insert.c f8c7da31409ec19a769b960a4a2b9cca7bab80bd
 F src/journal.c cffd2cd214e58c0e99c3ff632b3bee6c7cbb260e
 F src/legacy.c 3626c71fb70912abec9a4312beba753a9ce800df
 F src/loadext.c 40024a0f476c1279494876b9a002001b29e5d3e3
-F src/main.c 854dabef0de7653234b22a4431c93a50c8513af3
+F src/main.c 942283a5fc983a36504cc6476b6d054911921fec
 F src/malloc.c f52166df8abd7ff6990dbee1a0ce3534addc8617
 F src/md5.c 008216bbb5d34c6fbab5357aa68575ad8a31516a
 F src/mem1.c 8340fa5f969e9f9b9bdeb54106457a2003456d2b
@@ -136,7 +136,7 @@ F src/os_win.c 2bf2f8cd700299564cc236262c2668e1e02c626a
 F src/pager.c e2a49872f1e15eb83895ace704c48ac8ded998ba
 F src/pager.h 6aa3050a3c684475a5a9dbad5ff1cebad612acba
 F src/parse.y 8c2c3145eebe1964eb279cb3c4e502eae28bb0fa
-F src/pragma.c e6c55362d164e4bc8ebc83a9a01635552d854800
+F src/pragma.c 9a95f5b3708f6d3ddd987eab5f369a19ffcb6795
 F src/prepare.c aba51dad52308e3d9d2074d8ff4e612e7f1cab51
 F src/printf.c 8b063da9dcde26b7c500a01444b718d86f21bc6e
 F src/random.c 5c754319d38abdd6acd74601ee0105504adc508a
@@ -144,7 +144,7 @@ F src/select.c 79f60dc4a7e90bb907c7a2cca42f45276d1ead99
 F src/shell.c 479807b87f0409289eec4a776cd6ae56d30544b1
 F src/sqlite.h.in 0dfa5d11d2c063ef551cbc9f3933295857e420fc
 F src/sqlite3ext.h f162a72daef5ebf8b211fe8c0ec96e85d22fbf9b
-F src/sqliteInt.h 71e0839f4d4d8bcb59513da8a74d6652f379b145
+F src/sqliteInt.h 5ed69fd1affa577a47ce01baa42ee94f22f45ed7
 F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
 F src/status.c 6cb10377992505bd69f1ca1d75c1240a65f25a58
 F src/table.c 1fa8f8113ac9cbc09ae4801c6d2a7f0af82c5822
@@ -161,7 +161,7 @@ F src/test9.c 4615ef08750245a2d96aaa7cbe2fb4aff2b57acc
 F src/test_async.c da9f58f49faccd3a26ba89f58de125862351b6e2
 F src/test_autoext.c 5e892ab84aece3f0428920bf46923f16ac83962a
 F src/test_btree.c c1308ba0b88ab577fa56c9e493a09829dfcded9c
-F src/test_config.c 9a00dbd91db9e470868537580ab5f9b2744aecb9
+F src/test_config.c e893a7195e975f133c4481d679089531c2970c73
 F src/test_devsym.c 6012cb8e3acf812513511025a4fa5d626e0ba19b
 F src/test_func.c f4aafa10f17d52c43a64b47717265802e6e552b3
 F src/test_hexio.c 2f1122aa3f012fa0142ee3c36ce5c902a70cd12f
@@ -169,7 +169,7 @@ F src/test_loadext.c df8ab3a6481ddebbdf0d28ebac5d9e0790f7860f
 F src/test_malloc.c db4b54a81e83c0e71e1780365e022ed96fac52b0
 F src/test_md5.c 28209a4e2068711b5443c33104fe41f21d160071
 F src/test_mutex.c b1433eb96520656fb3e4a218253a94ac32bd5775
-F src/test_onefile.c 1f87d4a21cbfb24a7c35e4333fa0bd34d641f68d
+F src/test_onefile.c 243157b10275251c5dc2d6619aee2ff9ae22379c
 F src/test_osinst.c 867f1317bd135f942a63eab5a78da40fc70d1493
 F src/test_schema.c e3f93725f7c5b2cff84a69dc4332040dfbc8f81a
 F src/test_server.c f0a403b5f699c09bd2b1236b6f69830fd6221f6b
@@ -586,7 +586,7 @@ F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
 F tool/report1.txt 9eae07f26a8fc53889b45fc833a66a33daa22816
 F tool/showdb.c a086a3d788c7a23cb008317c3180ceb19f20bce0
 F tool/showjournal.c ec3b171be148656827c4949fbfb8ab4370822f87
-F tool/soak1.tcl 8f1ae78983fc69875a7fd842674a89bbdd6f2f92
+F tool/soak1.tcl 8d407956e1a45b485a8e072470a3e629a27037fe
 F tool/space_used.tcl f714c41a59e326b8b9042f415b628b561bafa06b
 F tool/spaceanal.tcl b87db46ae29e3116411b1686e136b9b994d7de39
 F tool/speedtest.tcl 06c76698485ccf597b9e7dbb1ac70706eb873355
@@ -594,7 +594,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 70b2ed2afcf1757d1c58f3a83dad4a5fb226ae63
-R df8b8896ce8671ae160fad9b334243c6
+P cdd4cf4ce2ab363ddc3f27c5e44896e17269a161
+R 4b084b9e9669e70ff412e4ed6bcd00b8
 U danielk1977
-Z 3d25949f4d1f7064f4f07f76e0a70374
+Z 57e6cb4b6ed478ad88e2ade57e93f2ba
diff --git a/manifest.uuid b/manifest.uuid
index 9775afdd33..4d972150b6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cdd4cf4ce2ab363ddc3f27c5e44896e17269a161
\ No newline at end of file
+1e3b8308021107d983d2152663f62b369cca091d
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 50d933a5d7..3b49d9d125 100644
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.464 2008/06/26 10:41:19 danielk1977 Exp $
+** $Id: main.c,v 1.465 2008/06/26 10:54:12 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -919,19 +919,19 @@ void *sqlite3_rollback_hook(
 **
 ** A virtual database can be either a disk file (that is automatically
 ** deleted when the file is closed) or it an be held entirely in memory,
-** depending on the values of the TEMP_STORE compile-time macro and the
+** depending on the values of the SQLITE_TEMP_STORE compile-time macro and the
 ** db->temp_store variable, according to the following chart:
 **
-**       TEMP_STORE     db->temp_store     Location of temporary database
-**       ----------     --------------     ------------------------------
-**           0               any             file
-**           1                1              file
-**           1                2              memory
-**           1                0              file
-**           2                1              file
-**           2                2              memory
-**           2                0              memory
-**           3               any             memory
+**   SQLITE_TEMP_STORE     db->temp_store     Location of temporary database
+**   -----------------     --------------     ------------------------------
+**   0                     any                file
+**   1                     1                  file
+**   1                     2                  memory
+**   1                     0                  file
+**   2                     1                  file
+**   2                     2                  memory
+**   2                     0                  memory
+**   3                     any                memory
 */
 int sqlite3BtreeFactory(
   const sqlite3 *db,        /* Main database when opening aux otherwise 0 */
@@ -953,17 +953,17 @@ int sqlite3BtreeFactory(
     btFlags |= BTREE_NO_READLOCK;
   }
   if( zFilename==0 ){
-#if TEMP_STORE==0
+#if SQLITE_TEMP_STORE==0
     /* Do nothing */
 #endif
 #ifndef SQLITE_OMIT_MEMORYDB
-#if TEMP_STORE==1
+#if SQLITE_TEMP_STORE==1
     if( db->temp_store==2 ) zFilename = ":memory:";
 #endif
-#if TEMP_STORE==2
+#if SQLITE_TEMP_STORE==2
     if( db->temp_store!=1 ) zFilename = ":memory:";
 #endif
-#if TEMP_STORE==3
+#if SQLITE_TEMP_STORE==3
     zFilename = ":memory:";
 #endif
 #endif /* SQLITE_OMIT_MEMORYDB */
diff --git a/src/pragma.c b/src/pragma.c
index c4c0709439..79a9d89c30 100644
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains code used to implement the PRAGMA command.
 **
-** $Id: pragma.c,v 1.180 2008/06/22 12:37:58 drh Exp $
+** $Id: pragma.c,v 1.181 2008/06/26 10:54:12 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -127,7 +127,7 @@ static int invalidateTempStorage(Parse *pParse){
 #ifndef SQLITE_OMIT_PAGER_PRAGMAS
 /*
 ** If the TEMP database is open, close it and mark the database schema
-** as needing reloading.  This must be done when using the TEMP_STORE
+** as needing reloading.  This must be done when using the SQLITE_TEMP_STORE
 ** or DEFAULT_TEMP_STORE pragmas.
 */
 static int changeTempStorage(Parse *pParse, const char *zStorageType){
@@ -674,9 +674,9 @@ void sqlite3Pragma(
           goto pragma_out;
         }
       }
-      if( TEMP_STORE==0
-       || (TEMP_STORE==1 && db->temp_store<=1)
-       || (TEMP_STORE==2 && db->temp_store==1)
+      if( SQLITE_TEMP_STORE==0
+       || (SQLITE_TEMP_STORE==1 && db->temp_store<=1)
+       || (SQLITE_TEMP_STORE==2 && db->temp_store==1)
       ){
         invalidateTempStorage(pParse);
       }
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 942396a6fc..7757f6915b 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.730 2008/06/26 08:29:34 danielk1977 Exp $
+** @(#) $Id: sqliteInt.h,v 1.731 2008/06/26 10:54:12 danielk1977 Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -249,11 +249,11 @@
 #endif
 
 /*
-** Provide a default value for TEMP_STORE in case it is not specified
+** Provide a default value for SQLITE_TEMP_STORE in case it is not specified
 ** on the command-line
 */
-#ifndef TEMP_STORE
-# define TEMP_STORE 1
+#ifndef SQLITE_TEMP_STORE
+# define SQLITE_TEMP_STORE 1
 #endif
 
 /*
diff --git a/src/test_config.c b/src/test_config.c
index 76a921fdae..35ca0c188c 100644
--- a/src/test_config.c
+++ b/src/test_config.c
@@ -16,7 +16,7 @@
 ** The focus of this file is providing the TCL testing layer
 ** access to compile-time constants.
 **
-** $Id: test_config.c,v 1.29 2008/06/26 10:41:19 danielk1977 Exp $
+** $Id: test_config.c,v 1.30 2008/06/26 10:54:12 danielk1977 Exp $
 */
 
 #include "sqliteLimit.h"
@@ -460,7 +460,7 @@ Tcl_SetVar2(interp, "sqlite_options", "long_double",
   LINKVAR( MAX_ATTACHED );
 
   {
-    static const int cv_TEMP_STORE = TEMP_STORE;
+    static const int cv_TEMP_STORE = SQLITE_TEMP_STORE;
     Tcl_LinkVar(interp, "TEMP_STORE", (char *)&(cv_TEMP_STORE),
                 TCL_LINK_INT | TCL_LINK_READ_ONLY);
   }
diff --git a/src/test_onefile.c b/src/test_onefile.c
index f931922788..c8cc43c806 100644
--- a/src/test_onefile.c
+++ b/src/test_onefile.c
@@ -10,7 +10,7 @@
 **
 *************************************************************************
 **
-** $Id: test_onefile.c,v 1.8 2008/06/06 11:11:26 danielk1977 Exp $
+** $Id: test_onefile.c,v 1.9 2008/06/26 10:54:12 danielk1977 Exp $
 **
 ** OVERVIEW:
 **
@@ -28,8 +28,8 @@
 **   from sqlite3_malloc(). Any attempt to create a temporary database file 
 **   will fail (SQLITE_IOERR). To prevent SQLite from attempting this,
 **   it should be configured to store all temporary database files in 
-**   main memory (see pragma "temp_store" or the TEMP_STORE compile time
-**   option).
+**   main memory (see pragma "temp_store" or the SQLITE_TEMP_STORE compile 
+**   time option).
 **
 ** ASSUMPTIONS:
 **
diff --git a/tool/soak1.tcl b/tool/soak1.tcl
index ac50c38f94..846f905935 100644
--- a/tool/soak1.tcl
+++ b/tool/soak1.tcl
@@ -78,14 +78,14 @@ scenario 2 {Everything} {
 }
 scenario 3 {Customer-1} {
   SQLITE_DEBUG=1 SQLITE_MEMDEBUG=1
-  THREADSAFE=1 SQLITE_OS_UNIX=1
+  SQLITE_THREADSAFE=1 SQLITE_OS_UNIX=1
   SQLITE_DISABLE_LFS=1
   SQLITE_DEFAULT_AUTOVACUUM=1
   SQLITE_DEFAULT_PAGE_SIZE=1024
   SQLITE_MAX_PAGE_SIZE=4096
   SQLITE_DEFAULT_CACHE_SIZE=64
   SQLITE_DEFAULT_TEMP_CACHE_SIZE=32
-  TEMP_STORE=3
+  SQLITE_TEMP_STORE=3
   SQLITE_OMIT_PROGRESS_CALLBACK=1
   SQLITE_OMIT_LOAD_EXTENSION=1
   SQLITE_OMIT_VIRTUALTABLE=1
@@ -93,11 +93,11 @@ scenario 3 {Customer-1} {
 }
 scenario 4 {Small-Cache} {
   SQLITE_DEBUG=1 SQLITE_MEMDEBUG=1
-  THREADSAFE=1 SQLITE_OS_UNIX=1
+  SQLITE_THREADSAFE=1 SQLITE_OS_UNIX=1
   SQLITE_DEFAULT_AUTOVACUUM=1
   SQLITE_DEFAULT_PAGE_SIZE=1024
   SQLITE_MAX_PAGE_SIZE=2048
   SQLITE_DEFAULT_CACHE_SIZE=13
   SQLITE_DEFAULT_TEMP_CACHE_SIZE=11
-  TEMP_STORE=1
+  SQLITE_TEMP_STORE=1
 }