29 files changed, 28 insertions, 28 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 1eeaa9d9b..3c6693c2a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2058,10 +2058,10 @@ manaplustests_SOURCES = \
 	      unittests/render/mockgraphics.cc \
 	      unittests/render/mockgraphics.h \
 	      unittests/endian.cc \
-	      unittests/enums/enums_unittest.cc \
+	      unittests/enums/enums.cc \
 	      unittests/sdl.cc \
-	      unittests/utils/dumplibs_unittest.cc \
-	      unittests/utils/checkutils_unittest.cc
+	      unittests/utils/dumplibs.cc \
+	      unittests/utils/checkutils.cc
 
 if ENABLE_UNITTESTS_CATCH
 manaplustests_SOURCES += \
@@ -2085,28 +2085,28 @@ manaplustests_SOURCES += \
 	      unittests/fs/virtfs/virtfs1_mountdir.cc \
 	      unittests/fs/virtfs/virtfs1_mountzip.cc \
 	      unittests/fs/virtfs/virtfs1_unmount.cc \
-	      unittests/fs/virtfs/virtfs2_unittest.cc \
-	      unittests/fs/virtfs/zip_unittest.cc \
-	      unittests/fs/virtfs/virtfs_unittest.cc \
-	      unittests/utils/xml_unittest.cc \
-	      unittests/configuration_unittest.cc \
-	      unittests/utils/timer_unittest.cc \
-	      unittests/utils/xmlutils_unittest.cc \
-	      unittests/utils/mathutils_unittest.cc \
-	      unittests/fs/files_unittest.cc \
-	      unittests/utils/stringutils_unittest.cc \
-	      unittests/utils/parameters_unittest.cc \
-	      unittests/resources/mstack_unittest.cc \
-	      unittests/utils/translation/poparser_unittest.cc \
-	      unittests/utils/langs_unittest.cc \
-	      unittests/resources/sprite/animatedsprite_unittest.cc \
-	      unittests/gui/fonts/textchunklist_unittest.cc \
-	      unittests/gui/widgets/browserbox_unittest.cc \
-	      unittests/resources/dye/dye_unittest.cc \
-	      unittests/resources/dye/dyepalette_unittest.cc \
-	      unittests/integrity_unittest.cc \
-	      unittests/utils/chatutils_unittest.cc \
-	      unittests/resources/map/speciallayer_unittest.cc \
+	      unittests/fs/virtfs/virtfs2.cc \
+	      unittests/fs/virtfs/zip.cc \
+	      unittests/fs/virtfs/virtfs.cc \
+	      unittests/utils/xml.cc \
+	      unittests/configuration.cc \
+	      unittests/utils/timer.cc \
+	      unittests/utils/xmlutils.cc \
+	      unittests/utils/mathutils.cc \
+	      unittests/fs/files.cc \
+	      unittests/utils/stringutils.cc \
+	      unittests/utils/parameters.cc \
+	      unittests/resources/mstack.cc \
+	      unittests/utils/translation/poparser.cc \
+	      unittests/utils/langs.cc \
+	      unittests/resources/sprite/animatedsprite.cc \
+	      unittests/gui/fonts/textchunklist.cc \
+	      unittests/gui/widgets/browserbox.cc \
+	      unittests/resources/dye/dye.cc \
+	      unittests/resources/dye/dyepalette.cc \
+	      unittests/integrity.cc \
+	      unittests/utils/chatutils.cc \
+	      unittests/resources/map/speciallayer.cc \
 	      unittests/resources/map/maplayer/draw.cc \
 	      unittests/resources/map/maplayer/drawfringenormal.cc \
 	      unittests/resources/map/maplayer/drawfringesimple.cc \
@@ -2116,9 +2116,9 @@ manaplustests_SOURCES += \
 	      unittests/resources/map/maplayer/gettiledrawwidth.cc \
 	      unittests/resources/map/maplayer/updatecache.cc \
 	      unittests/resources/map/maplayer/updateconditiontiles.cc \
-	      unittests/resources/resourcemanager/resourcemanager_unittest.cc \
-	      unittests/resources/sdlimagehelper_unittest.cc \
-	      unittests/gui/windowmanager_unittest.cc
+	      unittests/resources/resourcemanager/resourcemanager.cc \
+	      unittests/resources/sdlimagehelper.cc \
+	      unittests/gui/windowmanager.cc
 
 manaplustests_SOURCES += ${SRC}
 
diff --git a/src/unittests/configuration_unittest.cc b/src/unittests/configuration.cc
index 58073bbdb..58073bbdb 100644
--- a/src/unittests/configuration_unittest.cc
+++ b/src/unittests/configuration.cc
diff --git a/src/unittests/enums/enums_unittest.cc b/src/unittests/enums/enums.cc
index ebff849d9..ebff849d9 100644
--- a/src/unittests/enums/enums_unittest.cc
+++ b/src/unittests/enums/enums.cc
diff --git a/src/unittests/fs/files_unittest.cc b/src/unittests/fs/files.cc
index f3a15b174..f3a15b174 100644
--- a/src/unittests/fs/files_unittest.cc
+++ b/src/unittests/fs/files.cc
diff --git a/src/unittests/fs/virtfs/virtfs_unittest.cc b/src/unittests/fs/virtfs/virtfs.cc
index c31f0965e..c31f0965e 100644
--- a/src/unittests/fs/virtfs/virtfs_unittest.cc
+++ b/src/unittests/fs/virtfs/virtfs.cc
diff --git a/src/unittests/fs/virtfs/virtfs2_unittest.cc b/src/unittests/fs/virtfs/virtfs2.cc
index 8e578cc71..8e578cc71 100644
--- a/src/unittests/fs/virtfs/virtfs2_unittest.cc
+++ b/src/unittests/fs/virtfs/virtfs2.cc
diff --git a/src/unittests/fs/virtfs/zip_unittest.cc b/src/unittests/fs/virtfs/zip.cc
index 6ea9063fe..6ea9063fe 100644
--- a/src/unittests/fs/virtfs/zip_unittest.cc
+++ b/src/unittests/fs/virtfs/zip.cc
diff --git a/src/unittests/gui/fonts/textchunklist_unittest.cc b/src/unittests/gui/fonts/textchunklist.cc
index c8df87455..c8df87455 100644
--- a/src/unittests/gui/fonts/textchunklist_unittest.cc
+++ b/src/unittests/gui/fonts/textchunklist.cc
diff --git a/src/unittests/gui/widgets/browserbox_unittest.cc b/src/unittests/gui/widgets/browserbox.cc
index 128c7a52c..128c7a52c 100644
--- a/src/unittests/gui/widgets/browserbox_unittest.cc
+++ b/src/unittests/gui/widgets/browserbox.cc
diff --git a/src/unittests/gui/windowmanager_unittest.cc b/src/unittests/gui/windowmanager.cc
index 6090555ee..6090555ee 100644
--- a/src/unittests/gui/windowmanager_unittest.cc
+++ b/src/unittests/gui/windowmanager.cc
diff --git a/src/unittests/integrity_unittest.cc b/src/unittests/integrity.cc
index 9da17cf84..9da17cf84 100644
--- a/src/unittests/integrity_unittest.cc
+++ b/src/unittests/integrity.cc
diff --git a/src/unittests/resources/dye/dye_unittest.cc b/src/unittests/resources/dye/dye.cc
index fcdeb7b17..fcdeb7b17 100644
--- a/src/unittests/resources/dye/dye_unittest.cc
+++ b/src/unittests/resources/dye/dye.cc
diff --git a/src/unittests/resources/dye/dyepalette_unittest.cc b/src/unittests/resources/dye/dyepalette.cc
index 0e99e9871..0e99e9871 100644
--- a/src/unittests/resources/dye/dyepalette_unittest.cc
+++ b/src/unittests/resources/dye/dyepalette.cc
diff --git a/src/unittests/resources/map/speciallayer_unittest.cc b/src/unittests/resources/map/speciallayer.cc
index 0461a98c4..0461a98c4 100644
--- a/src/unittests/resources/map/speciallayer_unittest.cc
+++ b/src/unittests/resources/map/speciallayer.cc
diff --git a/src/unittests/resources/mstack_unittest.cc b/src/unittests/resources/mstack.cc
index 1d2233803..1d2233803 100644
--- a/src/unittests/resources/mstack_unittest.cc
+++ b/src/unittests/resources/mstack.cc
diff --git a/src/unittests/resources/resourcemanager/resourcemanager_unittest.cc b/src/unittests/resources/resourcemanager/resourcemanager.cc
index 90bc873ab..90bc873ab 100644
--- a/src/unittests/resources/resourcemanager/resourcemanager_unittest.cc
+++ b/src/unittests/resources/resourcemanager/resourcemanager.cc
diff --git a/src/unittests/resources/sdlimagehelper_unittest.cc b/src/unittests/resources/sdlimagehelper.cc
index 2a3aec45b..2a3aec45b 100644
--- a/src/unittests/resources/sdlimagehelper_unittest.cc
+++ b/src/unittests/resources/sdlimagehelper.cc
diff --git a/src/unittests/resources/sprite/animatedsprite_unittest.cc b/src/unittests/resources/sprite/animatedsprite.cc
index 3e4a1826c..3e4a1826c 100644
--- a/src/unittests/resources/sprite/animatedsprite_unittest.cc
+++ b/src/unittests/resources/sprite/animatedsprite.cc
diff --git a/src/unittests/utils/chatutils_unittest.cc b/src/unittests/utils/chatutils.cc
index 681d91d3e..681d91d3e 100644
--- a/src/unittests/utils/chatutils_unittest.cc
+++ b/src/unittests/utils/chatutils.cc
diff --git a/src/unittests/utils/checkutils_unittest.cc b/src/unittests/utils/checkutils.cc
index c54dcf9fc..c54dcf9fc 100644
--- a/src/unittests/utils/checkutils_unittest.cc
+++ b/src/unittests/utils/checkutils.cc
diff --git a/src/unittests/utils/dumplibs_unittest.cc b/src/unittests/utils/dumplibs.cc
index 35b80c710..35b80c710 100644
--- a/src/unittests/utils/dumplibs_unittest.cc
+++ b/src/unittests/utils/dumplibs.cc
diff --git a/src/unittests/utils/langs_unittest.cc b/src/unittests/utils/langs.cc
index d9ff6eded..d9ff6eded 100644
--- a/src/unittests/utils/langs_unittest.cc
+++ b/src/unittests/utils/langs.cc
diff --git a/src/unittests/utils/mathutils_unittest.cc b/src/unittests/utils/mathutils.cc
index 3eb0214ef..3eb0214ef 100644
--- a/src/unittests/utils/mathutils_unittest.cc
+++ b/src/unittests/utils/mathutils.cc
diff --git a/src/unittests/utils/parameters_unittest.cc b/src/unittests/utils/parameters.cc
index 90d872d5a..90d872d5a 100644
--- a/src/unittests/utils/parameters_unittest.cc
+++ b/src/unittests/utils/parameters.cc
diff --git a/src/unittests/utils/stringutils_unittest.cc b/src/unittests/utils/stringutils.cc
index ee0a00cb0..ee0a00cb0 100644
--- a/src/unittests/utils/stringutils_unittest.cc
+++ b/src/unittests/utils/stringutils.cc
diff --git a/src/unittests/utils/timer_unittest.cc b/src/unittests/utils/timer.cc
index b5cfc692e..b5cfc692e 100644
--- a/src/unittests/utils/timer_unittest.cc
+++ b/src/unittests/utils/timer.cc
diff --git a/src/unittests/utils/translation/poparser_unittest.cc b/src/unittests/utils/translation/poparser.cc
index f724e66fb..f724e66fb 100644
--- a/src/unittests/utils/translation/poparser_unittest.cc
+++ b/src/unittests/utils/translation/poparser.cc
diff --git a/src/unittests/utils/xml_unittest.cc b/src/unittests/utils/xml.cc
index f9f7990f8..f9f7990f8 100644
--- a/src/unittests/utils/xml_unittest.cc
+++ b/src/unittests/utils/xml.cc
diff --git a/src/unittests/utils/xmlutils_unittest.cc b/src/unittests/utils/xmlutils.cc
index c17ca98e4..c17ca98e4 100644
--- a/src/unittests/utils/xmlutils_unittest.cc
+++ b/src/unittests/utils/xmlutils.cc