diff -r 8a6a40f2e3dc -r 45c83c88ac4b QTfrontend/hwform.cpp
--- a/QTfrontend/hwform.cpp	Thu Apr 13 06:39:01 2017 +0200
+++ b/QTfrontend/hwform.cpp	Thu Apr 13 15:18:07 2017 +0200
@@ -474,8 +474,8 @@
 
         HWTeam defaultTeam(teamName);
         // Randomize fort and grave for greater variety by default
-        defaultTeam.setGrave(HWNamegen::getRandomGrave());
-        defaultTeam.setFort(HWNamegen::getRandomFort());
+        HWNamegen::teamRandomGrave(defaultTeam);
+        HWNamegen::teamRandomFort(defaultTeam);
         defaultTeam.saveToFile();
         teamslist.push_back(teamName);
 
@@ -484,8 +484,8 @@
         {
             teamName = tr("Team %1").arg(i);
             HWTeam numberTeam(teamName);
-            numberTeam.setGrave(HWNamegen::getRandomGrave());
-            numberTeam.setFort(HWNamegen::getRandomFort());
+            HWNamegen::teamRandomGrave(numberTeam);
+            HWNamegen::teamRandomFort(numberTeam);
             numberTeam.saveToFile();
             teamslist.push_back(teamName);
         }