diff --git a/changelog.md b/changelog.md
index dcd7913..7954926 100644
--- a/changelog.md
+++ b/changelog.md
@@ -25,6 +25,7 @@ These changes will (most likely) be included in the next version.
 - The Root Target ability now uses potion effects (slowness, slow falling, and negative jump boost) instead of repeated teleports. This should make for a smoother root experience.
 - Permissions for arenas and classes are now based on "slugs". It is now possible to configure permissions for arenas and classes with multi-word names (including "My Items"). Check the Permissions page on the wiki for details.
 - Commands that resolve class names now consistently resolve and tab complete "slugs" instead of arbitrarily "squashed" names. This greatly improves support for multi-word names.
+- The class signs generated by the `/ma autogenerate` command now use class names from the config-file instead of arbitrarily "squashed" names.
 - Using `spectate-on-death: true` no longer forces players out to their join location/exit warp before moving them to the spectator area. This should prevent "jumpy" behavior in multi-world setups.
 - Players should now properly respawn at the spectator area rather than at world spawn on servers with plugins that override respawn locations.
 - Config-files with missing `pet-items` nodes no longer errors. A missing `pet-items` node in `global-settings` is treated as empty, i.e. no pet items will be registered.
diff --git a/src/main/java/com/garbagemule/MobArena/MAUtils.java b/src/main/java/com/garbagemule/MobArena/MAUtils.java
index 8afefef..62e73d2 100644
--- a/src/main/java/com/garbagemule/MobArena/MAUtils.java
+++ b/src/main/java/com/garbagemule/MobArena/MAUtils.java
@@ -5,7 +5,6 @@ import com.garbagemule.MobArena.framework.ArenaMaster;
 import com.garbagemule.MobArena.region.ArenaRegion;
 import com.garbagemule.MobArena.things.InvalidThingInputString;
 import com.garbagemule.MobArena.things.ThingPicker;
-import com.garbagemule.MobArena.util.TextUtils;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -322,14 +321,14 @@ public class MAUtils
 
         // Place the hippie signs
         //Iterator<String> iterator = am.getClasses().iterator();
-        Iterator<String> iterator = am.getClasses().keySet().iterator();
+        Iterator<ArenaClass> iterator = am.getClasses().values().iterator();
         Rotatable signData = (Rotatable) Material.SIGN.createBlockData();
         signData.setRotation(BlockFace.NORTH);
         for (int i = lx1+2; i <= lx2-2; i++) // Signs
         {
             world.getBlockAt(i,ly1+1,lz2-1).setBlockData(signData);
             Sign sign = (Sign) world.getBlockAt(i,ly1+1,lz2-1).getState();
-            sign.setLine(0, TextUtils.camelCase(iterator.next()));
+            sign.setLine(0, iterator.next().getConfigName());
             sign.update();
         }
         world.getBlockAt(lx2-2,ly1+1,lz1+2).setType(Material.IRON_BLOCK);