diff --git a/langs/a+.yaml b/langs/aplus.yaml
similarity index 89%
rename from langs/a+.yaml
rename to langs/aplus.yaml
index b6e257d..6c0552a 100644
--- a/langs/a+.yaml
+++ b/langs/aplus.yaml
@@ -1,5 +1,7 @@
-id: "a+"
+id: "aplus"
 aliases:
+  - "a+"
+  - "ap"
   - "aplus"
 name: "A+"
 
diff --git a/langs/aspectc++.yaml b/langs/aspectcpp.yaml
similarity index 84%
rename from langs/aspectc++.yaml
rename to langs/aspectcpp.yaml
index 0d5a5bd..453ba3b 100644
--- a/langs/aspectc++.yaml
+++ b/langs/aspectcpp.yaml
@@ -1,6 +1,7 @@
-id: "aspectc++"
+id: "aspectcpp"
 aliases:
-  - "aspectcpp"
+  - "aspectc++"
+  - "aspectcplusplus"
 name: "AspectC++"
 
 install:
diff --git a/langs/c++.yaml b/langs/cpp.yaml
similarity index 97%
rename from langs/c++.yaml
rename to langs/cpp.yaml
index 895c640..ea7382d 100644
--- a/langs/c++.yaml
+++ b/langs/cpp.yaml
@@ -1,6 +1,6 @@
-id: "c++"
+id: "cpp"
 aliases:
-  - "cpp"
+  - "c++"
   - "g++"
   - "clang++"
   - "c++98"
@@ -18,6 +18,7 @@ aliases:
   - "hpp"
   - "cxx"
   - "hxx"
+  - "cplusplus"
 name: "C++"
 monacoLang: cpp
 
diff --git a/langs/objectivec++.yaml b/langs/objectivecpp.yaml
similarity index 93%
rename from langs/objectivec++.yaml
rename to langs/objectivecpp.yaml
index f97db77..201415d 100644
--- a/langs/objectivec++.yaml
+++ b/langs/objectivecpp.yaml
@@ -1,8 +1,9 @@
-id: "objectivec++"
+id: "objectivecpp"
 aliases:
   - "objc++"
   - "objcpp"
-  - "objectivecpp"
+  - "objectivec++"
+  - "objectivecplusplus"
 name: "Objective-C++"
 
 install: