diff --git a/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java b/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java
index 53a91895..b72f2ea3 100644
--- a/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java
+++ b/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java
@@ -237,7 +237,7 @@ public class BubbleConfiguration extends PgRestServerConfiguration
                         {TAG_SAGE_LAUNCHER, isSageLauncher()},
                         {TAG_PAYMENTS_ENABLED, paymentsEnabled()},
                         {TAG_CLOUD_DRIVERS, getCloudDriverClasses()},
-                        {TAG_ENTITY_CLASSES, getSortedEntityClassNames()},
+                        {TAG_ENTITY_CLASSES, getSortedSimpleEntityClassMap()},
                         {TAG_LOCALES, getAllLocales()}
                 }));
             }
diff --git a/bubble-web b/bubble-web
index f332144f..ad214071 160000
--- a/bubble-web
+++ b/bubble-web
@@ -1 +1 @@
-Subproject commit f332144fb96b891587c71763c42fd6a36b7efc2d
+Subproject commit ad21407132f5f8f54798678630238e57baaa3d53
diff --git a/utils/cobbzilla-wizard b/utils/cobbzilla-wizard
index bd34a8a5..addef002 160000
--- a/utils/cobbzilla-wizard
+++ b/utils/cobbzilla-wizard
@@ -1 +1 @@
-Subproject commit bd34a8a554f53e7a43d5f5dd4f6a4eef80ff542a
+Subproject commit addef002a2c186e317fd6bacc01648fa56d4e5f8