diff --git a/lib/linguist/heuristics.yml b/lib/linguist/heuristics.yml
index 8d4e2f689f..0f4d29fe88 100644
--- a/lib/linguist/heuristics.yml
+++ b/lib/linguist/heuristics.yml
@@ -511,7 +511,7 @@ disambiguations:
   - language: MAXScript
 - extensions: ['.msg']
   rules:
-  - language: omnetpp-msg
+  - language: OMNeT++ MSG
     pattern: '^cplusplus\(?[\S]*\)?[\s]*\{?\{?|^namespace[\s]+([^.\s]*\.)*[^.\s]*;|^struct[\s]+[\S]+|^message[\s]+[\S]+(extends )?[\S]*[\s]*|^packet[\s]+[\S]+|^class[\s]+[\S]+(extends )?[\S]*[\s]*|^enum[\s]+[\S]+|^import ([^.\s]*\.)*[^.\s]*;'
 - extensions: ['.n']
   rules:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 4854b7e484..83cd473a2c 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -4961,6 +4961,26 @@ OCaml:
   - ocamlscript
   tm_scope: source.ocaml
   language_id: 255
+OMNeT++ MSG:
+  type: programming
+  extensions:
+  - ".msg"
+  color: "#a0e0a0"
+  tm_scope: source.msg
+  ace_mode: text
+  aliases:
+  - omnetpp-msg
+  language_id: 664100008
+OMNeT++ NED:
+  type: programming
+  extensions:
+  - ".ned"
+  color: "#08607c"
+  tm_scope: source.ned
+  ace_mode: text
+  aliases:
+  - omnetpp-ned
+  language_id: 924868392
 Oberon:
   type: programming
   extensions:
@@ -8669,22 +8689,6 @@ nesC:
   ace_mode: text
   tm_scope: source.nesc
   language_id: 417
-omnetpp-msg:
-  type: programming
-  extensions:
-  - ".msg"
-  color: "#a0e0a0"
-  tm_scope: source.msg
-  ace_mode: text
-  language_id: 664100008
-omnetpp-ned:
-  type: programming
-  extensions:
-  - ".ned"
-  color: "#08607c"
-  tm_scope: source.ned
-  ace_mode: text
-  language_id: 924868392
 ooc:
   type: programming
   color: "#b0b77e"
diff --git a/samples/omnetpp-msg/GptpPacket.msg b/samples/OMNeT++ MSG/GptpPacket.msg
similarity index 100%
rename from samples/omnetpp-msg/GptpPacket.msg
rename to samples/OMNeT++ MSG/GptpPacket.msg
diff --git a/samples/omnetpp-msg/TcpConnection.msg b/samples/OMNeT++ MSG/TcpConnection.msg
similarity index 100%
rename from samples/omnetpp-msg/TcpConnection.msg
rename to samples/OMNeT++ MSG/TcpConnection.msg
diff --git a/samples/omnetpp-msg/TcpConnectionState.msg b/samples/OMNeT++ MSG/TcpConnectionState.msg
similarity index 100%
rename from samples/omnetpp-msg/TcpConnectionState.msg
rename to samples/OMNeT++ MSG/TcpConnectionState.msg
diff --git a/samples/omnetpp-ned/IWirelessInterface.ned b/samples/OMNeT++ NED/IWirelessInterface.ned
similarity index 100%
rename from samples/omnetpp-ned/IWirelessInterface.ned
rename to samples/OMNeT++ NED/IWirelessInterface.ned
diff --git a/samples/omnetpp-ned/Ieee80211Interface.ned b/samples/OMNeT++ NED/Ieee80211Interface.ned
similarity index 100%
rename from samples/omnetpp-ned/Ieee80211Interface.ned
rename to samples/OMNeT++ NED/Ieee80211Interface.ned
diff --git a/samples/omnetpp-ned/TsnNetworkBase.ned b/samples/OMNeT++ NED/TsnNetworkBase.ned
similarity index 100%
rename from samples/omnetpp-ned/TsnNetworkBase.ned
rename to samples/OMNeT++ NED/TsnNetworkBase.ned
diff --git a/test/test_heuristics.rb b/test/test_heuristics.rb
index d20c4f84b3..64e0f05b85 100755
--- a/test/test_heuristics.rb
+++ b/test/test_heuristics.rb
@@ -732,7 +732,7 @@ def test_ms_by_heuristics
 
   def test_msg_by_heuristics
     assert_heuristics({
-      "omnetpp-msg" => all_fixtures("omnetpp-msg", "*.msg"),
+      "OMNeT++ MSG" => all_fixtures("OMNeT++ MSG", "*.msg"),
     })
   end
 
diff --git a/vendor/README.md b/vendor/README.md
index ee9570b8ac..3c17be2765 100644
--- a/vendor/README.md
+++ b/vendor/README.md
@@ -402,6 +402,8 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **OASv3-json:** [Nixinova/NovaGrammars](https://github.com/Nixinova/NovaGrammars)
 - **OASv3-yaml:** [atom/language-yaml](https://github.com/atom/language-yaml)
 - **OCaml:** [textmate/ocaml.tmbundle](https://github.com/textmate/ocaml.tmbundle)
+- **OMNeT++ MSG:** [omnetpp/omnetpp-textmate-msg](https://github.com/omnetpp/omnetpp-textmate-msg)
+- **OMNeT++ NED:** [omnetpp/omnetpp-textmate-ned](https://github.com/omnetpp/omnetpp-textmate-ned)
 - **Oberon:** [harogaston/Sublime-Modula-2](https://github.com/harogaston/Sublime-Modula-2)
 - **ObjDump:** [nanoant/assembly.tmbundle](https://github.com/nanoant/assembly.tmbundle)
 - **Object Data Instance Notation:** [Alhadis/language-etc](https://github.com/Alhadis/language-etc)
@@ -684,8 +686,6 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **mupad:** [ccreutzig/sublime-MuPAD](https://github.com/ccreutzig/sublime-MuPAD)
 - **nanorc:** [Alhadis/language-etc](https://github.com/Alhadis/language-etc)
 - **nesC:** [cdwilson/nesC.tmbundle](https://github.com/cdwilson/nesC.tmbundle)
-- **omnetpp-msg:** [omnetpp/omnetpp-textmate-msg](https://github.com/omnetpp/omnetpp-textmate-msg)
-- **omnetpp-ned:** [omnetpp/omnetpp-textmate-ned](https://github.com/omnetpp/omnetpp-textmate-ned)
 - **ooc:** [nilium/ooc.tmbundle](https://github.com/nilium/ooc.tmbundle)
 - **q:** [komsit37/sublime-q](https://github.com/komsit37/sublime-q)
 - **reStructuredText:** [Lukasa/language-restructuredtext](https://github.com/Lukasa/language-restructuredtext)