diff --git a/tools/add.C b/tools/add.C
index b19d6db465..ffbc63de43 100644
--- a/tools/add.C
+++ b/tools/add.C
@@ -227,7 +227,7 @@ void add_user() {
 int main(int argc, char** argv) {
     int i;
 
-    db_open("boinc");
+    db_open(getenv("BOINC_DB_NAME"));
     for (i=2; i<argc; i++) {
         if (!strcmp(argv[i], "-app_name")) {
             i++;
diff --git a/tools/backend_lib.C b/tools/backend_lib.C
index b2a4b6da79..421010ccc8 100644
--- a/tools/backend_lib.C
+++ b/tools/backend_lib.C
@@ -95,14 +95,14 @@ static int process_wu_template(
         if (p) {
             found = true;
             strcpy(buf, p+strlen(UPLOAD_URL_MACRO));
-            strcpy(p, UPLOAD_URL);
+            strcpy(p, getenv("BOINC_UPLOAD_URL"));
             strcat(p, buf);
         }
         p = strstr(out, DOWNLOAD_URL_MACRO);
         if (p) {
             found = true;
             strcpy(buf, p+strlen(DOWNLOAD_URL_MACRO));
-            strcpy(p, DOWNLOAD_URL);
+            strcpy(p, getenv("BOINC_DOWNLOAD_URL"));
             strcat(p, buf);
         }
         p = strstr(out, MD5_MACRO);
diff --git a/tools/create_work.C b/tools/create_work.C
index 3ebb07304d..6b1bc1bc4b 100644
--- a/tools/create_work.C
+++ b/tools/create_work.C
@@ -65,7 +65,7 @@ int main(int argc, char** argv) {
         printf("must define BOINC_DOWNLOAD_DIR");
         exit(1);
     }
-    if( db_open("boinc") ) {
+    if (db_open(getenv("BOINC_DB_NAME"))) {
         printf( "Error opening database.\n" );
         exit(0);
     }
diff --git a/tools/process_result_template.C b/tools/process_result_template.C
index 6079159d76..ee62b6fa09 100644
--- a/tools/process_result_template.C
+++ b/tools/process_result_template.C
@@ -87,7 +87,6 @@ int process_result_template(
             fprintf(out, "</file_info>\n");
             continue;
         }
-
         while (1) {
             found = false;
             p = strstr(buf, OUTFILE_MACRO);
@@ -105,14 +104,14 @@ int process_result_template(
             if (p) {
                 found = true;
                 strcpy(temp, p+strlen(UPLOAD_URL_MACRO));
-                strcpy(p, UPLOAD_URL);
+                strcpy(p, getenv("BOINC_UPLOAD_URL"));
                 strcat(p, temp);
             }
             p = strstr(buf, DOWNLOAD_URL_MACRO);
             if (p) {
                 found = true;
                 strcpy(temp, p+strlen(DOWNLOAD_URL_MACRO));
-                strcpy(p, DOWNLOAD_URL);
+                strcpy(p, getenv("BOINC_DOWNLOAD_URL"));
                 strcat(p, temp);
             }
             p = strstr(buf, WU_NAME_MACRO);