Index: /trunk/ippTools/src/dettool.c
===================================================================
--- /trunk/ippTools/src/dettool.c	(revision 7195)
+++ /trunk/ippTools/src/dettool.c	(revision 7196)
@@ -16,7 +16,7 @@
 static psArray *validDetInputClassIds(pxConfig *config, const char *det_id);
 static bool stacframeMode(pxConfig *config);
-static bool addmasterMode(pxConfig *config);
-static bool masterMode(pxConfig *config);
-static bool masterframeMode(pxConfig *config);
+static bool addnormalizedMode(pxConfig *config);
+static bool normalizedMode(pxConfig *config);
+static bool normalizedframeMode(pxConfig *config);
 
 static detInputExpRow *rawDetrenTodetInputExpRow(rawDetrendExpRow *rawExp, psS32 det_id);
@@ -63,16 +63,16 @@
             }
             break;
-        case DETTOOL_MODE_ADDMASTER:
-            if (!addmasterMode(config)) {
+        case DETTOOL_MODE_ADDNORMALIZED:
+            if (!addnormalizedMode(config)) {
                 goto FAIL;
             }
             break;
-        case DETTOOL_MODE_MASTER:
-            if (masterMode(config)) {
+        case DETTOOL_MODE_NORMALIZED:
+            if (normalizedMode(config)) {
                 goto FAIL;
             }
             break;
-        case DETTOOL_MODE_MASTERFRAME:
-            if (masterframeMode(config)) {
+        case DETTOOL_MODE_NORMALIZEDFRAME:
+            if (normalizedframeMode(config)) {
                 goto FAIL;
             }
@@ -728,5 +728,5 @@
 }
 
-static bool addmasterMode(pxConfig *config)
+static bool addnormalizedMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -813,5 +813,5 @@
 }
 
-static bool masterMode(pxConfig *config)
+static bool normalizedMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -845,5 +845,5 @@
 }
 
-static bool masterframeMode(pxConfig *config)
+static bool normalizedframeMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
Index: /trunk/ippTools/src/dettool.h
===================================================================
--- /trunk/ippTools/src/dettool.h	(revision 7195)
+++ /trunk/ippTools/src/dettool.h	(revision 7196)
@@ -13,7 +13,7 @@
     DETTOOL_MODE_STACKED,
     DETTOOL_MODE_STACKEDFRAME,
-    DETTOOL_MODE_ADDMASTER,
-    DETTOOL_MODE_MASTER,
-    DETTOOL_MODE_MASTERFRAME,
+    DETTOOL_MODE_ADDNORMALIZED,
+    DETTOOL_MODE_NORMALIZED,
+    DETTOOL_MODE_NORMALIZEDFRAME,
 } dettoolMode;
 
Index: /trunk/ippTools/src/dettoolConfig.c
===================================================================
--- /trunk/ippTools/src/dettoolConfig.c	(revision 7195)
+++ /trunk/ippTools/src/dettoolConfig.c	(revision 7196)
@@ -125,43 +125,43 @@
         "search for recipe", NULL);
  
-    // -addmaster
-    psMetadata *addmasterArgs = psMetadataAlloc();
-    psMetadataAddStr(addmasterArgs, PS_LIST_TAIL, "-det_id",  0,
+    // -addnormalized
+    psMetadata *addnormalizedArgs = psMetadataAlloc();
+    psMetadataAddStr(addnormalizedArgs, PS_LIST_TAIL, "-det_id",  0,
         "define detrend ID", NULL);
-    psMetadataAddStr(addmasterArgs, PS_LIST_TAIL, "-class_id",  0,
+    psMetadataAddStr(addnormalizedArgs, PS_LIST_TAIL, "-class_id",  0,
         "define class ID", NULL);
-    psMetadataAddStr(addmasterArgs, PS_LIST_TAIL, "-iter",  0,
+    psMetadataAddStr(addnormalizedArgs, PS_LIST_TAIL, "-iter",  0,
         "define iteration number", NULL);
-    psMetadataAddStr(addmasterArgs, PS_LIST_TAIL, "-uri",  0,
+    psMetadataAddStr(addnormalizedArgs, PS_LIST_TAIL, "-uri",  0,
         "define URI", NULL);
-    psMetadataAddStr(addmasterArgs, PS_LIST_TAIL, "-stats",  0,
+    psMetadataAddStr(addnormalizedArgs, PS_LIST_TAIL, "-stats",  0,
         "define stat", NULL);
-    psMetadataAddStr(addmasterArgs, PS_LIST_TAIL, "-recipe",  0,
+    psMetadataAddStr(addnormalizedArgs, PS_LIST_TAIL, "-recipe",  0,
         "define recipe", NULL);
 
-    // -master
-    psMetadata *masterArgs = psMetadataAlloc();
-    psMetadataAddStr(masterArgs, PS_LIST_TAIL, "-det_id",  0,
-        "search for detrend ID", NULL);
-    psMetadataAddStr(masterArgs, PS_LIST_TAIL, "-class_id",  0,
-        "search for class ID", NULL);
-    psMetadataAddStr(masterArgs, PS_LIST_TAIL, "-iter",  0,
-        "search for iteration number", NULL);
-    psMetadataAddStr(masterArgs, PS_LIST_TAIL, "-stats",  0,
+    // -normalized
+    psMetadata *normalizedArgs = psMetadataAlloc();
+    psMetadataAddStr(normalizedArgs, PS_LIST_TAIL, "-det_id",  0,
+        "search for detrend ID", NULL);
+    psMetadataAddStr(normalizedArgs, PS_LIST_TAIL, "-class_id",  0,
+        "search for class ID", NULL);
+    psMetadataAddStr(normalizedArgs, PS_LIST_TAIL, "-iter",  0,
+        "search for iteration number", NULL);
+    psMetadataAddStr(normalizedArgs, PS_LIST_TAIL, "-stats",  0,
         "search for stats", NULL);
-    psMetadataAddStr(masterArgs, PS_LIST_TAIL, "-recipe",  0,
+    psMetadataAddStr(normalizedArgs, PS_LIST_TAIL, "-recipe",  0,
         "search for recipe", NULL);
 
-    // -masterframe
-    psMetadata *masterframeArgs = psMetadataAlloc();
-    psMetadataAddStr(masterframeArgs, PS_LIST_TAIL, "-det_id",  0,
-        "search for detrend ID", NULL);
-    psMetadataAddStr(masterframeArgs, PS_LIST_TAIL, "-class_id",  0,
-        "search for class ID", NULL);
-    psMetadataAddStr(masterframeArgs, PS_LIST_TAIL, "-iter",  0,
-        "search for iteration number", NULL);
-    psMetadataAddStr(masterframeArgs, PS_LIST_TAIL, "-stats",  0,
+    // -normalizedframe
+    psMetadata *normalizedframeArgs = psMetadataAlloc();
+    psMetadataAddStr(normalizedframeArgs, PS_LIST_TAIL, "-det_id",  0,
+        "search for detrend ID", NULL);
+    psMetadataAddStr(normalizedframeArgs, PS_LIST_TAIL, "-class_id",  0,
+        "search for class ID", NULL);
+    psMetadataAddStr(normalizedframeArgs, PS_LIST_TAIL, "-iter",  0,
+        "search for iteration number", NULL);
+    psMetadataAddStr(normalizedframeArgs, PS_LIST_TAIL, "-stats",  0,
         "search for stats", NULL);
-    psMetadataAddStr(masterframeArgs, PS_LIST_TAIL, "-recipe",  0,
+    psMetadataAddStr(normalizedframeArgs, PS_LIST_TAIL, "-recipe",  0,
         "search for recipe", NULL);
 
@@ -193,7 +193,7 @@
     PXTOOL_MODE("-stacked",         DETTOOL_MODE_STACKED,       stacArgs);
     PXTOOL_MODE("-stackedframe",    DETTOOL_MODE_STACKEDFRAME,  stacframeArgs);
-    PXTOOL_MODE("-addmaster",       DETTOOL_MODE_ADDMASTER,     addmasterArgs);
-    PXTOOL_MODE("-master",          DETTOOL_MODE_MASTER,        masterArgs);
-    PXTOOL_MODE("-masterframe",     DETTOOL_MODE_MASTERFRAME,   masterframeArgs);
+    PXTOOL_MODE("-addnormalized", DETTOOL_MODE_ADDNORMALIZED,addnormalizedArgs);
+    PXTOOL_MODE("-normalized",      DETTOOL_MODE_NORMALIZED,    normalizedArgs);
+    PXTOOL_MODE("-normalizedframe", DETTOOL_MODE_NORMALIZEDFRAME,normalizedframeArgs);
 
     bool argErr = false;
@@ -209,5 +209,5 @@
         printf("\nPan-STARRS Detrend Tool\n");
         printf("Usage: %s <mode> [<options>]\n\n", argv[0]);
-        printf(" <mode> : [-define|-raw|-addprocessed|-processed|-addstacked|-stacked|-stackedframe|-addmaster|-master|-masterframe]\n\n");
+        printf(" <mode> : [-define|-raw|-addprocessed|-processed|-addstacked|-stacked|-stackedframe|-addnormalized|-normalized|-normalizedframe]\n\n");
         fprintf (stdout, "-define ");
         psArgumentHelp(defineArgs);
@@ -231,13 +231,13 @@
         psArgumentHelp(stacframeArgs);
         psFree(stacframeArgs);
-        fprintf (stdout, "-addmaster ");
-        psArgumentHelp(addmasterArgs);
-        psFree(addmasterArgs);
-        fprintf (stdout, "-master ");
-        psArgumentHelp(masterArgs);
-        psFree(masterArgs);
-        fprintf (stdout, "-masterframe ");
-        psArgumentHelp(masterframeArgs);
-        psFree(masterframeArgs);
+        fprintf (stdout, "-addnormalized");
+        psArgumentHelp(addnormalizedArgs);
+        psFree(addnormalizedArgs);
+        fprintf (stdout, "-normalized");
+        psArgumentHelp(normalizedArgs);
+        psFree(normalizedArgs);
+        fprintf (stdout, "-normalizedframe ");
+        psArgumentHelp(normalizedframeArgs);
+        psFree(normalizedframeArgs);
 
         psFree(modes);
@@ -253,5 +253,5 @@
     psFree(stacArgs);
     psFree(stacframeArgs);
-    psFree(addmasterArgs);
+    psFree(addnormalizedArgs);
 
     // setup search criterion