Index: /trunk/ippTools/src/dettool.c
===================================================================
--- /trunk/ippTools/src/dettool.c	(revision 7378)
+++ /trunk/ippTools/src/dettool.c	(revision 7379)
@@ -27,6 +27,6 @@
 static bool addresidexpMode(pxConfig *config);
 static bool residexpMode(pxConfig *config);
-static bool addmasterMode(pxConfig *config);
-static bool masterMode(pxConfig *config);
+static bool addmasterframeMode(pxConfig *config);
+static bool masterframeMode(pxConfig *config);
 
 static detInputExpRow *rawDetrenTodetInputExpRow(rawDetrendExpRow *rawExp, psS32 det_id);
@@ -61,6 +61,6 @@
         MODECASE(DETTOOL_MODE_ADDRESIDEXP, addresidexpMode);
         MODECASE(DETTOOL_MODE_RESIDEXP, residexpMode);
-        MODECASE(DETTOOL_MODE_ADDMASTER, addmasterMode);
-        MODECASE(DETTOOL_MODE_MASTER, masterMode);
+        MODECASE(DETTOOL_MODE_ADDMASTERFRAME, addmasterframeMode);
+        MODECASE(DETTOOL_MODE_MASTERFRAME, masterframeMode);
         default:
             psAbort(argv[0], "invalid option (this should not happen)");
@@ -1621,5 +1621,5 @@
 }
 
-static bool addmasterMode(pxConfig *config)
+static bool addmasterframeMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -1670,5 +1670,5 @@
 }
 
-static bool masterMode(pxConfig *config)
+static bool masterframeMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
Index: /trunk/ippTools/src/dettool.h
===================================================================
--- /trunk/ippTools/src/dettool.h	(revision 7378)
+++ /trunk/ippTools/src/dettool.h	(revision 7379)
@@ -22,6 +22,6 @@
     DETTOOL_MODE_ADDRESIDEXP,
     DETTOOL_MODE_RESIDEXP,
-    DETTOOL_MODE_ADDMASTER,
-    DETTOOL_MODE_MASTER
+    DETTOOL_MODE_ADDMASTERFRAME,
+    DETTOOL_MODE_MASTERFRAME
 } dettoolMode;
 
Index: /trunk/ippTools/src/dettoolConfig.c
===================================================================
--- /trunk/ippTools/src/dettoolConfig.c	(revision 7378)
+++ /trunk/ippTools/src/dettoolConfig.c	(revision 7379)
@@ -227,16 +227,16 @@
         "search for acceptable residuals", false);
 
-    // -addmaster
-    psMetadata *addmasterArgs = psMetadataAlloc();
-    psMetadataAddStr(addmasterArgs, PS_LIST_TAIL, "-det_id",  0,
-        "define detrend ID (required)", NULL);
-    psMetadataAddStr(addmasterArgs, PS_LIST_TAIL, "-iteration",  0,
-        "define iteration number", NULL);
-    psMetadataAddStr(addmasterArgs, PS_LIST_TAIL, "-comment",  0,
+    // -addmasterframe
+    psMetadata *addmasterframeArgs = psMetadataAlloc();
+    psMetadataAddStr(addmasterframeArgs, PS_LIST_TAIL, "-det_id",  0,
+        "define detrend ID (required)", NULL);
+    psMetadataAddStr(addmasterframeArgs, PS_LIST_TAIL, "-iteration",  0,
+        "define iteration number", NULL);
+    psMetadataAddStr(addmasterframeArgs, PS_LIST_TAIL, "-comment",  0,
         "define master frame comment", NULL);
  
-    // -master
-    psMetadata *masterArgs = psMetadataAlloc();
-    psMetadataAddStr(masterArgs, PS_LIST_TAIL, "-det_id",  0,
+    // -masterframe
+    psMetadata *masterframeArgs = psMetadataAlloc();
+    psMetadataAddStr(masterframeArgs, PS_LIST_TAIL, "-det_id",  0,
         "search for detrend master for detrend ID", NULL);
 
@@ -277,6 +277,6 @@
     PXTOOL_MODE("-addresidexp",     DETTOOL_MODE_ADDRESIDEXP,  addresidexpArgs);
     PXTOOL_MODE("-residexp",        DETTOOL_MODE_RESIDEXP,     residexpArgs);
-    PXTOOL_MODE("-addmaster",       DETTOOL_MODE_ADDMASTER,    addmasterArgs);
-    PXTOOL_MODE("-master",          DETTOOL_MODE_MASTER,       masterArgs);
+    PXTOOL_MODE("-addmasterframe",DETTOOL_MODE_ADDMASTERFRAME,addmasterframeArgs);
+    PXTOOL_MODE("-masterframe",     DETTOOL_MODE_MASTERFRAME,  masterframeArgs);
 
     bool argErr = false;
@@ -292,5 +292,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|-addnormalized|-normalized|-normalizedframe|-addresid|-resid|-addresidexp|-residexp|-addmaster|-master]\n\n");
+        printf(" <mode> : [-define|-raw|-addprocessed|-processed|-addstacked|-stacked|-stackedframe|-addnormalized|-normalized|-normalizedframe|-addresid|-resid|-addresidexp|-residexp|-addmasterframe|-masterframe]\n\n");
         fprintf (stdout, "-define ");
         psArgumentHelp(defineArgs);
@@ -341,10 +341,10 @@
         psArgumentHelp(residexpArgs);
         psFree(residexpArgs);
-        fprintf (stdout, "-addmaster ");
-        psArgumentHelp(addmasterArgs);
-        psFree(addmasterArgs);
-        fprintf (stdout, "-master ");
-        psArgumentHelp(masterArgs);
-        psFree(masterArgs);
+        fprintf (stdout, "-addmasterframe ");
+        psArgumentHelp(addmasterframeArgs);
+        psFree(addmasterframeArgs);
+        fprintf (stdout, "-masterframe ");
+        psArgumentHelp(masterframeArgs);
+        psFree(masterframeArgs);
 
         exit(EXIT_FAILURE);
@@ -365,6 +365,6 @@
     psFree(addresidexpArgs);
     psFree(residexpArgs);
-    psFree(addmasterArgs);
-    psFree(masterArgs);
+    psFree(addmasterframeArgs);
+    psFree(masterframeArgs);
 
     // setup search criterion