Apparently pluses are disallowed in Docker tags

langs/aplus.yaml

@@ -1,5 +1,7 @@
-id: "a+"
+id: "aplus"
 aliases:
+  - "a+"
+  - "ap"
   - "aplus"
 name: "A+"
 

langs/aspectcpp.yaml

@@ -1,6 +1,7 @@
-id: "aspectc++"
+id: "aspectcpp"
 aliases:
-  - "aspectcpp"
+  - "aspectc++"
+  - "aspectcplusplus"
 name: "AspectC++"
 
 install:

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
 

langs/objectivecpp.yaml

@@ -1,8 +1,9 @@
-id: "objectivec++"
+id: "objectivecpp"
 aliases:
   - "objc++"
   - "objcpp"
-  - "objectivecpp"
+  - "objectivec++"
+  - "objectivecplusplus"
 name: "Objective-C++"
 
 install: