diff --git a/tools/setup/emoji/emoji_names.py b/tools/setup/emoji/emoji_names.py
index ccac4ad382..6399c9f78d 100644
--- a/tools/setup/emoji/emoji_names.py
+++ b/tools/setup/emoji/emoji_names.py
@@ -1309,8 +1309,8 @@ EMOJI_NAME_MAPS: Dict[str, Dict[str, Any]] = {
     "1f6d5": {"canonical_name": "hindu_temple", "aliases": ["hindu", "temple"]},
     "1f6d6": {"canonical_name": "hut", "aliases": ["roundhouse", "yurt"]},
     "1f6d7": {"canonical_name": "elevator", "aliases": ["hoist"]},
-    "1f6dc": {"canonical_name": "wireless", "aliases": ["internet", "network"]},
-    "1f6dd": {"canonical_name": "playground_slide", "aliases": ["amusement_park"]},
+    "1f6dc": {"canonical_name": "wireless", "aliases": ["internet", "network", "wi_fi", "wifi"]},
+    "1f6dd": {"canonical_name": "playground_slide", "aliases": ["amusement_park", "theme_park"]},
     "1f6de": {"canonical_name": "wheel", "aliases": ["tire", "turn"]},
     "1f6df": {
         "canonical_name": "ring_buoy",
@@ -1608,7 +1608,7 @@ EMOJI_NAME_MAPS: Dict[str, Dict[str, Any]] = {
     "1f9d1-200d-1f33e": {"canonical_name": "farmer", "aliases": []},
     "1f9d1-200d-1f373": {"canonical_name": "cook", "aliases": []},
     "1f9d1-200d-1f37c": {"canonical_name": "person_feeding_baby", "aliases": []},
-    "1f9d1-200d-1f384": {"canonical_name": "mx_claus", "aliases": ["claus_christmas"]},
+    "1f9d1-200d-1f384": {"canonical_name": "mx_claus", "aliases": ["christmas", "claus"]},
     "1f9d1-200d-1f393": {"canonical_name": "student", "aliases": []},
     "1f9d1-200d-1f3a4": {"canonical_name": "singer", "aliases": []},
     "1f9d1-200d-1f3a8": {"canonical_name": "artist", "aliases": []},