Index: trunk/ippTools/src/Makefile.am
===================================================================
--- trunk/ippTools/src/Makefile.am	(revision 11997)
+++ trunk/ippTools/src/Makefile.am	(revision 12025)
@@ -22,11 +22,11 @@
 	dettool.h \
 	detselect.h \
-	p0tool.h \
-	p1tool.h \
-	p2tool.h \
-	p3tool.h \
-	p4tool.h \
-	p5tool.h \
-	p6tool.h \
+	regtool.h \
+	guidetool.h \
+	chiptool.h \
+	camtool.h \
+	warptool.h \
+	difftool.h \
+	stacktool.h \
 	pxadmin.h \
 	pxinject.h \
@@ -60,42 +60,42 @@
 regtool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 regtool_SOURCES = \
-    p0tool.c \
-    p0toolConfig.c
+    regtool.c \
+    regtoolConfig.c
 
 guidetool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) 
 guidetool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 guidetool_SOURCES = \
-    p1tool.c \
-    p1toolConfig.c
+    guidetool.c \
+    guidetoolConfig.c
 
 chiptool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 chiptool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 chiptool_SOURCES = \
-    p2tool.c \
-    p2toolConfig.c
+    chiptool.c \
+    chiptoolConfig.c
 
 camtool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 camtool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 camtool_SOURCES = \
-    p3tool.c \
-    p3toolConfig.c
+    camtool.c \
+    camtoolConfig.c
 
 warptool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 warptool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 warptool_SOURCES = \
-    p4tool.c \
-    p4toolConfig.c
+    warptool.c \
+    warptoolConfig.c
 
 difftool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 difftool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 difftool_SOURCES = \
-    p5tool.c \
-    p5toolConfig.c
+    difftool.c \
+    difftoolConfig.c
 
 stacktool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 stacktool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 stacktool_SOURCES = \
-    p6tool.c \
-    p6toolConfig.c
+    stacktool.c \
+    stacktoolConfig.c
 
 pxadmin_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)