diff --git a/assets/layers/charging_station/charging_station.protojson b/assets/layers/charging_station/charging_station.protojson
index a15ec7fe3..43e5bd5a2 100644
--- a/assets/layers/charging_station/charging_station.protojson
+++ b/assets/layers/charging_station/charging_station.protojson
@@ -22,8 +22,44 @@
   "title": {
     "render": {
       "en": "Charging station",
-      "nl": "Oplaadpunten"
-    }
+      "nl": "Oplaadpunt"
+    },
+    "mappings": [
+      {
+        "if": {
+          "and": [
+            "bicycle=yes",
+            {
+              "or": [
+                "motorcar=",
+                "motorcar=no"
+              ]
+            }
+          ]
+        },
+        "then": {
+          "en": "Charging station for ebikes",
+          "nl": "Oplaadpunt voor elektrische fietsen"
+        }
+      },
+      {
+        "if": {
+          "and": [
+            "motorcar=yes",
+            {
+              "or": [
+                "bicycle=",
+                "bicycle=no"
+              ]
+            }
+          ]
+        },
+        "then": {
+          "en": "Charging station for cars",
+          "nl": "Oplaadpunt voor elektrische auto's"
+        }
+      }
+    ]
   },
   "description": {
     "en": "A charging station",
@@ -61,7 +97,7 @@
           "ifnot": "scooter=no",
           "then": {
             "en": "<b>Scooters</b> can be charged here",
-            "nl": "<b>Electrische scooters</b> (snorfiets of bromfiets) kunnen hier opgeladen worden"
+            "nl": "<b>Elektrische scooters</b> (snorfiets of bromfiets) kunnen hier opgeladen worden"
           }
         },
         {
@@ -768,8 +804,8 @@
         "socket:typee=1"
       ],
       "title": {
-        "en": "charging station with a normal european wall plug <img src='./assets/layers/charging_station/TypeE.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (meant to charge electrical bikes)",
-        "nl": "laadpunt met gewone stekker(s) <img src='./assets/layers/charging_station/TypeE.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (bedoeld om electrische fietsen op te laden)"
+        "en": "charging station for electrical bikes with a normal european wall plug <img src='./assets/layers/charging_station/TypeE.svg' style='width: 2rem; height: 2rem; float: left; background: white; border-radius: 1rem; margin-right: 0.5rem'/> (meant to charge electrical bikes)",
+        "nl": "oplaadpunt voor elektrische fietsen"
       },
       "preciseInput": {
         "preferredBackground": "map"