Index: trunk/ippTools/scripts/camtest.sh
===================================================================
--- trunk/ippTools/scripts/camtest.sh	(revision 11987)
+++ trunk/ippTools/scripts/camtest.sh	(revision 12024)
@@ -3,9 +3,9 @@
 set -o verbose
 
-p2test.sh || exit 1
+chiptest.sh || exit 1
 
-p3tool -pendingexp || exit 1
-p3tool -pendingimfile || exit 1
+camtool -pendingexp || exit 1
+camtool -pendingimfile || exit 1
 
-p3tool -addprocessedexp -exp_tag t10.1 -uri file://p3p -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -sigma_ra 1 -sigma_dec 2 -nastro 42 -b1_uri file:///foo -b2_uri file://bar -zp_mean 1 -zp_stdev 2 || exit 1
-p3tool -addprocessedexp -exp_tag t11.2 -uri file://p3p -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -sigma_ra 1 -sigma_dec 2 -nastro 42 -b1_uri file:///foo -b2_uri file://bar -zp_mean 1 -zp_stdev 2 || exit 1
+camtool -addprocessedexp -exp_tag t10.1 -uri file://camp -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -sigma_ra 1 -sigma_dec 2 -nastro 42 -b1_uri file:///foo -b2_uri file://bar -zp_mean 1 -zp_stdev 2 || exit 1
+camtool -addprocessedexp -exp_tag t11.2 -uri file://camp -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -sigma_ra 1 -sigma_dec 2 -nastro 42 -b1_uri file:///foo -b2_uri file://bar -zp_mean 1 -zp_stdev 2 || exit 1
Index: trunk/ippTools/scripts/chiptest.sh
===================================================================
--- trunk/ippTools/scripts/chiptest.sh	(revision 11987)
+++ trunk/ippTools/scripts/chiptest.sh	(revision 12024)
@@ -3,15 +3,15 @@
 set -o verbose
 
-p0test.sh || exit 1
+regtest.sh || exit 1
 
-p2tool -pendingimfile || exit 1
+chiptool -pendingimfile || exit 1
 
 for ID in `seq 0 3`; do
-    p2tool -addprocessedimfile -exp_tag t10.1 -class_id $ID -uri file://p2p-t10.$ID -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -b1_uri file:///foo -b2_uri file://bar || exit 1
+    chiptool -addprocessedimfile -exp_tag t10.1 -class_id $ID -uri file://chipp-t10.$ID -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -b1_uri file:///foo -b2_uri file://bar || exit 1
 done;
 
 for ID in `seq 0 3`; do
-    p2tool -addprocessedimfile -exp_tag t11.2 -class_id $ID -uri file://p2p-t11.$ID -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -b1_uri file:///foo -b2_uri file://bar || exit 1
+    chiptool -addprocessedimfile -exp_tag t11.2 -class_id $ID -uri file://chipp-t11.$ID -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -b1_uri file:///foo -b2_uri file://bar || exit 1
 done;
 
-p2tool -pendingimfile || exit 1
+chiptool -pendingimfile || exit 1
Index: trunk/ippTools/scripts/dettest.sh
===================================================================
--- trunk/ippTools/scripts/dettest.sh	(revision 11987)
+++ trunk/ippTools/scripts/dettest.sh	(revision 12024)
@@ -5,5 +5,5 @@
 det_id=1
 
-./p0test.sh -detrend || exit 1
+./regtest.sh -detrend || exit 1
 
 det_id=`dettool -definebyquery -det_type flat -exp_type fooflat -filter foo -airmass_min 1 -airmass_max 10 -exp_time_min 10 -exp_time_max 30.0 -workdir file::///some/path -simple | cut -f1 -d" "` || exit 1
Index: trunk/ippTools/scripts/difftest.sh
===================================================================
--- trunk/ippTools/scripts/difftest.sh	(revision 11987)
+++ trunk/ippTools/scripts/difftest.sh	(revision 12024)
@@ -3,14 +3,14 @@
 set -o verbose
 
-p4test.sh || exit 1
+warptest.sh || exit 1
 
 
-p5tool -definerun -workdir file:///tmp/p5 -skycell_id foo -tess_id bar || exit 1
-p5tool -addinputskyfile -p5_id 2 -p4_id 1 -skycell_id foo1 -tess_id bar1 -kind warped -template || exit 1
-p5tool -addinputskyfile -p5_id 2 -p4_id 1 -skycell_id foo2 -tess_id bar2 -kind warped || exit 1
-p5tool -updaterun -state run -p5_id 1 || exit 1
-p5tool -todiffskyfile || exit 1
-p5tool -inputskyfile || exit 1
-p5tool -adddiffskyfile -p5_id 1 -uri file:///tmp/p5/skyfile -bg 1 -bg_mean_stdev 2 || exit 1
-p5tool -diffskyfile -p5_id 1 || exit 1
-p5tool -updaterun -state stop -p5_id 1 || exit 1
+difftool -definerun -workdir file:///tmp/diff -skycell_id foo -tess_id bar || exit 1
+difftool -addinputskyfile -diff_id 2 -warp_id 1 -skycell_id foo1 -tess_id bar1 -kind warped -template || exit 1
+difftool -addinputskyfile -diff_id 2 -warp_id 1 -skycell_id foo2 -tess_id bar2 -kind warped || exit 1
+difftool -updaterun -state run -diff_id 1 || exit 1
+difftool -todiffskyfile || exit 1
+difftool -inputskyfile || exit 1
+difftool -adddiffskyfile -diff_id 1 -uri file:///tmp/diff/skyfile -bg 1 -bg_mean_stdev 2 || exit 1
+difftool -diffskyfile -diff_id 1 || exit 1
+difftool -updaterun -state stop -diff_id 1 || exit 1
Index: trunk/ippTools/scripts/mapfile.txt
===================================================================
--- trunk/ippTools/scripts/mapfile.txt	(revision 11987)
+++ trunk/ippTools/scripts/mapfile.txt	(revision 12024)
@@ -1,19 +1,19 @@
-p4SkyCellMap MULTI
+warpSkyCellMap MULTI
 
-p4SkyCellMap METADATA
-    p4_id           S32     1
-    skycell_id      STR     foo
-    tess_id         STR     bar2
-    exp_tag         STR     baz2
-    p3_version      S32     0
-    class_id        STR     quix
+warpSkyCellMap METADATA
+    warp_id           S32     1
+    skycell_id      STR     foo1
+    tess_id         STR     bar
+    exp_tag         STR     t10.1
+    cam_version      S32     0
+    class_id        STR     quix1
 END
 
-p4SkyCellMap METADATA
-    p4_id           S32     1
+warpSkyCellMap METADATA
+    warp_id           S32     1
     skycell_id      STR     foo2
-    tess_id         STR     bar2
-    exp_tag         STR     baz
-    p3_version      S32     0
-    class_id        STR     quix
+    tess_id         STR     bar
+    exp_tag         STR     t10.1
+    cam_version      S32     0
+    class_id        STR     quix2
 END
Index: trunk/ippTools/scripts/regtest.sh
===================================================================
--- trunk/ippTools/scripts/regtest.sh	(revision 11987)
+++ trunk/ippTools/scripts/regtest.sh	(revision 12024)
@@ -4,5 +4,5 @@
 
 inject="pxinject"
-p0tool="p0tool"
+regtool="regtool"
 
 echo -e "YES\nipp\n\n" | pxadmin -recreate || exit 1
@@ -20,21 +20,21 @@
 done;
 
-$p0tool -pendingimfile || exit 1
+$regtool -pendingimfile || exit 1
 
 for ID in `seq 0 3`; do
-    $p0tool -addprocessedimfile -exp_tag $exp_tag1 -class OTA -class_id $ID -filter r -airmass 10 -ra 1 -decl 2 -exp_time 0 -bg 1 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 10 -posang 10 -object dog -dateobs 2006-10-20T10:10:10Z || exit 1
+    $regtool -addprocessedimfile -exp_tag $exp_tag1 -class OTA -class_id $ID -filter r -airmass 10 -ra 1 -decl 2 -exp_time 0 -bg 1 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 10 -posang 10 -object dog -dateobs 2006-10-20T10:10:10Z || exit 1
 done;
 
-$p0tool -pendingexp|| exit 1
+$regtool -pendingexp|| exit 1
 
-$p0tool -addprocessedexp -exp_tag $exp_tag1 -filter r -airmass 10 -ra 1 -decl 2 -exp_type bias -exp_time 0 -bg 10 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 45 -posang 10 -object dog -dateobs "2006-10-20T10:10:10Z" -label foobar $* || exit 1
+$regtool -addprocessedexp -exp_tag $exp_tag1 -filter r -airmass 10 -ra 1 -decl 2 -exp_type bias -exp_time 0 -bg 10 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 45 -posang 10 -object dog -dateobs "2006-10-20T10:10:10Z" -label foobar $* || exit 1
 
-$p0tool -pendingimfile || exit 1
+$regtool -pendingimfile || exit 1
 
 for ID in `seq 0 3`; do
-    $p0tool -addprocessedimfile -exp_tag $exp_tag2 -exp_type object -class OTA -class_id $ID -filter r -airmass 10 -ra 1 -decl 2 -exp_time 0 -bg 1 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 10 -posang 10 -object dog -dateobs 2006-10-20T10:10:10Z || exit 1
+    $regtool -addprocessedimfile -exp_tag $exp_tag2 -exp_type object -class OTA -class_id $ID -filter r -airmass 10 -ra 1 -decl 2 -exp_time 0 -bg 1 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 10 -posang 10 -object dog -dateobs 2006-10-20T10:10:10Z || exit 1
 done;
 
-$p0tool -pendingexp|| exit 1
+$regtool -pendingexp|| exit 1
 
-$p0tool -addprocessedexp -exp_tag $exp_tag2 -filter r -airmass 11 -ra 1 -decl 2 -exp_type bias -exp_time 0 -bg 11 -bg_stdev 1 -bg_mean_stdev 11 -alt 11 -az 11 -ccd_temp 45 -posang 11 -object dog -dateobs 2006-10-20T10:10:10Z -label foobar $* || exit 1
+$regtool -addprocessedexp -exp_tag $exp_tag2 -filter r -airmass 11 -ra 1 -decl 2 -exp_type bias -exp_time 0 -bg 11 -bg_stdev 1 -bg_mean_stdev 11 -alt 11 -az 11 -ccd_temp 45 -posang 11 -object dog -dateobs 2006-10-20T10:10:10Z -label foobar $* || exit 1
Index: trunk/ippTools/scripts/warptest.sh
===================================================================
--- trunk/ippTools/scripts/warptest.sh	(revision 11987)
+++ trunk/ippTools/scripts/warptest.sh	(revision 12024)
@@ -3,28 +3,28 @@
 set -o verbose
 
-p3test.sh || exit 1
+camtest.sh || exit 1
 
-p4tool -definerun -mode warp -workdir file:///foo || exit 1
+warptool -definerun -mode warp -workdir file:///foo || exit 1
 
-p4tool -addinputexp -p4_id 1 -exp_tag t10.1 -p3_version 0 || exit 1
+warptool -addinputexp -warp_id 1 -exp_tag t10.1 -cam_version 0 || exit 1
 
-p4tool -updaterun -p4_id 1 -state run || exit 1
+warptool -updaterun -warp_id 1 -state run || exit 1
 
-p4tool -exp -p4_id 1 || exit 1
+warptool -exp -warp_id 1 || exit 1
 
-p4tool -imfile -p4_id 1 || exit 1
+warptool -imfile -warp_id 1 || exit 1
 
-p4tool -tooverlap -p4_id 1 || exit 1
+warptool -tooverlap -warp_id 1 || exit 1
 
-p4tool -addoverlap -mapfile mapfile.txt || exit 1
+warptool -addoverlap -mapfile mapfile.txt || exit 1
 
-p4tool -scmap || exit 1
+warptool -scmap || exit 1
 
-p4tool -towarped || exit 1
+warptool -towarped || exit 1
 
-p4tool -addwarped -p4_id 1 -skycell_id foo1 -tess_id bar -uri file:///tmp/foo -bg 1 -bg_mean_stdev 2 || exit 1
-p4tool -addwarped -p4_id 1 -skycell_id foo2 -tess_id bar -uri file:///tmp/foo -bg 1 -bg_mean_stdev 2 || exit 1
+warptool -addwarped -warp_id 1 -skycell_id foo1 -tess_id bar -uri file:///tmp/foo -bg 1 -bg_mean_stdev 2 || exit 1
+warptool -addwarped -warp_id 1 -skycell_id foo2 -tess_id bar -uri file:///tmp/foo -bg 1 -bg_mean_stdev 2 || exit 1
 
-p4tool -warped -p4_id 1 || exit 1
+warptool -warped -warp_id 1 || exit 1
 
-#p4tool -updaterun -p4_id 1 -state stop || exit 1
+#warptool -updaterun -warp_id 1 -state stop || exit 1