diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.js b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
index 5e24a32575..1f622830d4 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -76,6 +76,11 @@ function initMain()
 	// Load AI list
 	g_AIs = Engine.GetAIs();
 
+	// Sort AIs by displayed name
+	g_AIs.sort(function (a, b) {
+		return a.data.name < b.data.name ? -1 : b.data.name < a.data.name ? +1 : 0;
+	});
+
 	// Get default player data - remove gaia
 	var pDefs = initPlayerDefaults();
 	pDefs.shift();
diff --git a/binaries/data/mods/public/simulation/ai/testbot/data.json b/binaries/data/mods/public/simulation/ai/testbot/data.json
index 819942db74..6f24dcec9a 100644
--- a/binaries/data/mods/public/simulation/ai/testbot/data.json
+++ b/binaries/data/mods/public/simulation/ai/testbot/data.json
@@ -1,5 +1,5 @@
 {
-  "name": "Test Bot",
-  "description": "A simple AI for testing the framework.",
+  "name": "Demo Bot",
+  "description": "A simple opponent, mainly designed for testing our AI scripting framework.",
   "constructor": "TestBotAI"
 }