diff --git a/roles/mote/templates/name_mappings.json b/roles/mote/templates/name_mappings.json
index 873d72e78b..f36b597476 100644
--- a/roles/mote/templates/name_mappings.json
+++ b/roles/mote/templates/name_mappings.json
@@ -1,10 +1,18 @@
 {
+    "apac" : {
+        "friendly-name": "APAC Ambassadors (Asia-Pacific)",
+        "aliases": ["apac-special-meeting", "apac_special_meeting"]
+    },
+    "badges": {
+        "friendly-name": "Fedora Badges Team",
+        "aliases": ["fedora_badges", "fedbadges", "badges_team", "fedora_badges_team"]
+    },
     "commops": {
         "friendly-name": "Fedora Community Operations (CommOps)",
         "aliases": ["fedora_commops"]
     },
     "emea_ambassadors": {
-        "friendly-name": "Fedora Europe, Middle East, and Africa (EMEA) Ambassadors",
+        "friendly-name": "EMEA Ambassadors (Europe, Middle East, and Africa)",
         "aliases": ["emea"]
     },
     "epel": {
@@ -12,7 +20,7 @@
         "aliases": []
     },
     "famna": {
-        "friendly-name": "Fedora North American Ambassadors",
+        "friendly-name": "NA Ambassadors (North America)",
         "aliases": []
     },
     "fedora_council": {
@@ -28,12 +36,12 @@
         "aliases": []
     },
     "fedora-latam": {
-    	"friendly-name": "Fedora Latin American Ambassadors",
+    	"friendly-name": "LATAM Ambassadors (Latin America)",
     	"aliases": ["fedora_latam_meeting", "fedora_latam", "fedora_latam_ambassadors", "fedora_latam_ambassadors_meeting", "latam_ambassadors", "latam_ambassadors_meeting", "ambassadors_latam", "fedora_ambassadors_latam", "latam"]
     },
-    "fedora-mktg": {
+    "marketing": {
         "friendly-name": "Fedora Marketing",
-        "aliases": ["marketing"]
+        "aliases": ["fedora-mktg"]
     },
     "fedora-qa": {
         "friendly-name": "Fedora QA",
@@ -52,11 +60,11 @@
         "aliases": []
     },
     "g11n": {
-        "friendly-name": "Fedora G11n Team",
+        "friendly-name": "Fedora Globalization (G11n) Team",
         "aliases": ["fedora-g11n", "fedora-globalization", "#fedora-g11n"]
     },
     "i18n": {
-        "friendly-name": "Fedora i18n Team",
+        "friendly-name": "Fedora Internationalization (i18n) Team",
         "aliases": []
     },
     "infrastructure": {