diff -r c305d31642ac -r d187ea93fc4f QTfrontend/util/namegen.cpp
--- a/QTfrontend/util/namegen.cpp	Wed Apr 25 17:44:48 2012 +0200
+++ b/QTfrontend/util/namegen.cpp	Thu Apr 26 07:22:05 2012 +0200
@@ -23,7 +23,7 @@
 #include <QLineEdit>
 
 #include "hwform.h"
-#include "HWDataManager.h"
+#include "DataManager.h"
 
 #include "namegen.h"
 
@@ -125,7 +125,7 @@
     QStringList list;
 
     // find .txt to load the names from
-    QFile * file = new QFile(HWDataManager::instance().findFileForRead(QString(
+    QFile * file = new QFile(DataManager::instance().findFileForRead(QString(
                                  "Names/%1.txt").arg(filename)));
 
     if (file->exists() && file->open(QIODevice::ReadOnly | QIODevice::Text))
@@ -154,7 +154,7 @@
     QStringList list;
 
     // find .cfg to load the dicts from
-    QFile * file = new QFile(HWDataManager::instance().findFileForRead(QString(
+    QFile * file = new QFile(DataManager::instance().findFileForRead(QString(
                                  "Names/%1.cfg").arg(hatname)));
 
     if (file->exists() && file->open(QIODevice::ReadOnly | QIODevice::Text))
@@ -184,7 +184,7 @@
 
     // find .ini to load the names from
     QFile * file = new QFile(
-        HWDataManager::instance().findFileForRead(QString("Names/types.ini")));
+        DataManager::instance().findFileForRead(QString("Names/types.ini")));
 
 
     if (file->exists() && file->open(QIODevice::ReadOnly | QIODevice::Text))
@@ -243,7 +243,7 @@
     QStringList Graves;
 
     //list all available Graves
-    Graves.append(HWDataManager::instance().entryList(
+    Graves.append(DataManager::instance().entryList(
                       "Graphics/Graves",
                       QDir::Files,
                       QStringList("*.png")
@@ -265,7 +265,7 @@
     QStringList Forts;
 
     //list all available Forts
-    Forts.append(HWDataManager::instance().entryList(
+    Forts.append(DataManager::instance().entryList(
                      "Forts",
                      QDir::Files,
                      QStringList("*L.png")