10 files changed, 18 insertions, 18 deletions
diff --git a/server/src/macrotool/Makefile.am b/server/src/macrotool/Makefile.am
index e6fdc94..32e8aee 100644
--- a/server/src/macrotool/Makefile.am
+++ b/server/src/macrotool/Makefile.am
@@ -9,10 +9,10 @@ macrotool_CXXFLAGS = -I.. $(PQXX_CXXFLAGS) $(CONFIG_CXXFLAGS) \
 
 macrotool_SOURCES = \
 	macrotool.cc \
-	macrotool_dump.cc \
-	macrotool_fieldnames.cc \
-	macrotool_filehandler.cc \
-	macrotool_util.cc \
+	dump.cc \
+	fieldnames.cc \
+	filehandler.cc \
+	util.cc \
 	../debug.cc \
 	../configuration.cc \
 	../configurationparser.cc \
@@ -33,10 +33,10 @@ macrotool_SOURCES = \
 	../versionstr.cc
 
 EXTRA_DIST = \
-	macrotool_dump.h \
-	macrotool_fieldnames.h \
-	macrotool_filehandler.h \
-	macrotool_util.h
+	dump.h \
+	fieldnames.h \
+	filehandler.h \
+	util.h
 
 ################
 # Test Section #
diff --git a/server/src/macrotool/macrotool_dump.cc b/server/src/macrotool/dump.cc
index 30d0fd5..6a5b018 100644
--- a/server/src/macrotool/macrotool_dump.cc
+++ b/server/src/macrotool/dump.cc
@@ -25,7 +25,7 @@
  *  along with Pracro; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
-#include "macrotool_dump.h"
+#include "dump.h"
 
 #include <vector>
 #include <map>
@@ -35,7 +35,7 @@
 
 #include <stdio.h>
 
-#include "macrotool_util.h"
+#include "util.h"
 
 #include "debug.h"
 
diff --git a/server/src/macrotool/macrotool_dump.h b/server/src/macrotool/dump.h
index 1f2101d..1f2101d 100644
--- a/server/src/macrotool/macrotool_dump.h
+++ b/server/src/macrotool/dump.h
diff --git a/server/src/macrotool/macrotool_fieldnames.cc b/server/src/macrotool/fieldnames.cc
index 8d90323..f348ef4 100644
--- a/server/src/macrotool/macrotool_fieldnames.cc
+++ b/server/src/macrotool/fieldnames.cc
@@ -25,12 +25,12 @@
  *  along with Pracro; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
-#include "macrotool_fieldnames.h"
+#include "fieldnames.h"
 
 #include <string.h>
 #include <stdio.h>
 
-#include "macrotool_util.h"
+#include "util.h"
 #include "macroparser.h"
 
 #include "debug.h"
diff --git a/server/src/macrotool/macrotool_fieldnames.h b/server/src/macrotool/fieldnames.h
index 0ac2759..0ac2759 100644
--- a/server/src/macrotool/macrotool_fieldnames.h
+++ b/server/src/macrotool/fieldnames.h
diff --git a/server/src/macrotool/macrotool_filehandler.cc b/server/src/macrotool/filehandler.cc
index f9a9b45..3c80a1c 100644
--- a/server/src/macrotool/macrotool_filehandler.cc
+++ b/server/src/macrotool/filehandler.cc
@@ -25,7 +25,7 @@
  *  along with Pracro; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
-#include "macrotool_filehandler.h"
+#include "filehandler.h"
 
 #include <fstream>
 #include <ios>
@@ -38,7 +38,7 @@
 
 #include "debug.h"
 
-#include "macrotool_util.h"
+#include "util.h"
 
 #include "configuration.h"
 
diff --git a/server/src/macrotool/macrotool_filehandler.h b/server/src/macrotool/filehandler.h
index 70777fc..70777fc 100644
--- a/server/src/macrotool/macrotool_filehandler.h
+++ b/server/src/macrotool/filehandler.h
diff --git a/server/src/macrotool/macrotool.cc b/server/src/macrotool/macrotool.cc
index c41bc9a..6d484ad 100644
--- a/server/src/macrotool/macrotool.cc
+++ b/server/src/macrotool/macrotool.cc
@@ -42,9 +42,9 @@
 
 #include "debug.h"
 
-#include "macrotool_dump.h"
-#include "macrotool_fieldnames.h"
-#include "macrotool_filehandler.h"
+#include "dump.h"
+#include "fieldnames.h"
+#include "filehandler.h"
 
 static const char version_str[] =
 "Pracro server v" VERSION "\n"
diff --git a/server/src/macrotool/macrotool_util.cc b/server/src/macrotool/util.cc
index 075a9e0..8be5435 100644
--- a/server/src/macrotool/macrotool_util.cc
+++ b/server/src/macrotool/util.cc
@@ -25,7 +25,7 @@
  *  along with Pracro; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
-#include "macrotool_util.h"
+#include "util.h"
 
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/server/src/macrotool/macrotool_util.h b/server/src/macrotool/util.h
index 2e41f6b..2e41f6b 100644
--- a/server/src/macrotool/macrotool_util.h
+++ b/server/src/macrotool/util.h