diff --git a/doc/user/RoutingModes.md b/doc/user/RoutingModes.md
index 0895e019716..c9b61712498 100644
--- a/doc/user/RoutingModes.md
+++ b/doc/user/RoutingModes.md
@@ -104,7 +104,7 @@ Used for short- and long-distance bus routes.
CABLE_CAR
-Used for street-level cable cars where the cable runs beneath the car.
+Used for street-level rail cars where the cable runs beneath the vehicle.
CARPOOL
diff --git a/src/client/classic-debug/i18n/ca_ES.po b/src/client/classic-debug/i18n/ca_ES.po
index 8dd8b1db1eb..8c31603fba4 100644
--- a/src/client/classic-debug/i18n/ca_ES.po
+++ b/src/client/classic-debug/i18n/ca_ES.po
@@ -931,7 +931,7 @@ msgstr ""
#. beneath the car.
#: src/client/js/otp/util/Itin.js:226
#, fuzzy
-msgid "Cable Car"
+msgid "Cable Tram"
msgstr "PONT PENJANT"
#. Any rail system designed for steep inclines.
diff --git a/src/client/classic-debug/i18n/de.po b/src/client/classic-debug/i18n/de.po
index 0585855e247..49ac31f1777 100644
--- a/src/client/classic-debug/i18n/de.po
+++ b/src/client/classic-debug/i18n/de.po
@@ -919,7 +919,7 @@ msgstr ""
#. Used for street-level cable cars where the cable runs
#. beneath the car.
#: src/client/js/otp/util/Itin.js:226
-msgid "Cable Car"
+msgid "Cable Tram"
msgstr "Standseilbahn"
#. Any rail system designed for steep inclines.
diff --git a/src/client/classic-debug/i18n/en.po b/src/client/classic-debug/i18n/en.po
index 4727ffef677..94ae67f6431 100644
--- a/src/client/classic-debug/i18n/en.po
+++ b/src/client/classic-debug/i18n/en.po
@@ -930,8 +930,8 @@ msgstr "Light Rail"
#. Used for street-level cable cars where the cable runs
#. beneath the car.
#: src/client/js/otp/util/Itin.js:226
-msgid "Cable Car"
-msgstr "Cable Car"
+msgid "Cable Tram"
+msgstr "Cable Tram"
#. Any rail system designed for steep inclines.
#: src/client/js/otp/util/Itin.js:228
diff --git a/src/client/classic-debug/i18n/es.po b/src/client/classic-debug/i18n/es.po
index b54e2510417..0799258ab92 100644
--- a/src/client/classic-debug/i18n/es.po
+++ b/src/client/classic-debug/i18n/es.po
@@ -924,7 +924,7 @@ msgstr "Tranvía"
#. Used for street-level cable cars where the cable runs
#. beneath the car.
#: src/client/js/otp/util/Itin.js:226
-msgid "Cable Car"
+msgid "Cable Tram"
msgstr "Bus Tranvía"
#. Any rail system designed for steep inclines.
diff --git a/src/client/classic-debug/i18n/fr.po b/src/client/classic-debug/i18n/fr.po
index 705b313786c..1c5e0f69b18 100644
--- a/src/client/classic-debug/i18n/fr.po
+++ b/src/client/classic-debug/i18n/fr.po
@@ -932,7 +932,7 @@ msgstr "Tram ou Trolley"
#. Used for street-level cable cars where the cable runs
#. beneath the car.
#: src/client/js/otp/util/Itin.js:226
-msgid "Cable Car"
+msgid "Cable Tram"
msgstr "Tramway funiculaire"
#. Any rail system designed for steep inclines.
diff --git a/src/client/classic-debug/i18n/hu.po b/src/client/classic-debug/i18n/hu.po
index 25411b79e58..02242925841 100644
--- a/src/client/classic-debug/i18n/hu.po
+++ b/src/client/classic-debug/i18n/hu.po
@@ -937,7 +937,7 @@ msgstr "Villamos, könnyűvasút"
#. Used for street-level cable cars where the cable runs
#. beneath the car.
#: src/client/js/otp/util/Itin.js:226
-msgid "Cable Car"
+msgid "Cable Tram"
msgstr ""
#. Any rail system designed for steep inclines.
diff --git a/src/client/classic-debug/i18n/it.po b/src/client/classic-debug/i18n/it.po
index 4d0abe553f3..eeb4442ef7c 100644
--- a/src/client/classic-debug/i18n/it.po
+++ b/src/client/classic-debug/i18n/it.po
@@ -976,7 +976,7 @@ msgstr "tram"
#. beneath the car.
#: src/client/js/otp/util/Itin.js:226
#, fuzzy
-msgid "Cable Car"
+msgid "Cable Tram"
msgstr "tram"
#. Any rail system designed for steep inclines.
diff --git a/src/client/classic-debug/i18n/messages.pot b/src/client/classic-debug/i18n/messages.pot
index ca5d59b1cc3..425b5c9bb43 100644
--- a/src/client/classic-debug/i18n/messages.pot
+++ b/src/client/classic-debug/i18n/messages.pot
@@ -896,7 +896,7 @@ msgstr ""
#. Used for street-level cable cars where the cable runs
#. beneath the car.
#: src/client/js/otp/util/Itin.js:226
-msgid "Cable Car"
+msgid "Cable Tram"
msgstr ""
#. Any rail system designed for steep inclines.
diff --git a/src/client/classic-debug/i18n/no.po b/src/client/classic-debug/i18n/no.po
index 9a1d5c9103d..8963f038601 100644
--- a/src/client/classic-debug/i18n/no.po
+++ b/src/client/classic-debug/i18n/no.po
@@ -926,7 +926,7 @@ msgstr "Trikk"
#. Used for street-level cable cars where the cable runs
#. beneath the car.
#: src/client/js/otp/util/Itin.js:226
-msgid "Cable Car"
+msgid "Cable Tram"
msgstr "Cable Car"
#. Any rail system designed for steep inclines.
diff --git a/src/client/classic-debug/i18n/pl.po b/src/client/classic-debug/i18n/pl.po
index b8a728e9495..8f08e8de7de 100644
--- a/src/client/classic-debug/i18n/pl.po
+++ b/src/client/classic-debug/i18n/pl.po
@@ -947,7 +947,7 @@ msgstr "Light Rail"
#. Used for street-level cable cars where the cable runs
#. beneath the car.
#: src/client/js/otp/util/Itin.js:226
-msgid "Cable Car"
+msgid "Cable Tram"
msgstr "Kolejka linowa"
#. Any rail system designed for steep inclines.
diff --git a/src/client/classic-debug/i18n/pt.po b/src/client/classic-debug/i18n/pt.po
index 83ed08f3df1..42fa0d978aa 100644
--- a/src/client/classic-debug/i18n/pt.po
+++ b/src/client/classic-debug/i18n/pt.po
@@ -925,7 +925,7 @@ msgstr "Ferroviário leve"
#. Used for street-level cable cars where the cable runs
#. beneath the car.
#: src/client/js/otp/util/Itin.js:226
-msgid "Cable Car"
+msgid "Cable Tram"
msgstr "Eléctrico"
#. Any rail system designed for steep inclines.
diff --git a/src/client/classic-debug/i18n/sl.po b/src/client/classic-debug/i18n/sl.po
index 93839344f76..23066db159c 100644
--- a/src/client/classic-debug/i18n/sl.po
+++ b/src/client/classic-debug/i18n/sl.po
@@ -931,7 +931,7 @@ msgstr "Tramvaj"
#. Used for street-level cable cars where the cable runs
#. beneath the car.
#: src/client/js/otp/util/Itin.js:226
-msgid "Cable Car"
+msgid "Cable Tram"
msgstr ""
#. Any rail system designed for steep inclines.
diff --git a/src/client/classic-debug/js/otp/locale/ca_ES.json b/src/client/classic-debug/js/otp/locale/ca_ES.json
index e0bc0c5e3ba..4ba89dde02d 100644
--- a/src/client/classic-debug/js/otp/locale/ca_ES.json
+++ b/src/client/classic-debug/js/otp/locale/ca_ES.json
@@ -155,7 +155,7 @@
"Train": "Tren",
"Ferry": "BOT",
"Light Rail": "",
- "Cable Car": "PONT PENJANT",
+ "Cable Tram": "PONT PENJANT",
"Funicular": "FUNICULAR",
"Aerial Tram": "",
"Airplane": "",
diff --git a/src/client/classic-debug/js/otp/locale/de.json b/src/client/classic-debug/js/otp/locale/de.json
index 5a0aa5316f4..79514b84b1a 100644
--- a/src/client/classic-debug/js/otp/locale/de.json
+++ b/src/client/classic-debug/js/otp/locale/de.json
@@ -155,7 +155,7 @@
"Train": "Bahn",
"Ferry": "Fähre",
"Light Rail": "",
- "Cable Car": "Standseilbahn",
+ "Cable Tram": "Standseilbahn",
"Funicular": "Seilbahn",
"Aerial Tram": "",
"Airplane": "",
diff --git a/src/client/classic-debug/js/otp/locale/en.json b/src/client/classic-debug/js/otp/locale/en.json
index 51e5565997c..f7ae611e458 100644
--- a/src/client/classic-debug/js/otp/locale/en.json
+++ b/src/client/classic-debug/js/otp/locale/en.json
@@ -155,7 +155,7 @@
"Train": "Train",
"Ferry": "Ferry",
"Light Rail": "Light Rail",
- "Cable Car": "Cable Car",
+ "Cable Tram": "Cable Tram",
"Funicular": "Funicular",
"Aerial Tram": "Aerial Tram",
"Airplane": "",
diff --git a/src/client/classic-debug/js/otp/locale/es.json b/src/client/classic-debug/js/otp/locale/es.json
index fca9c112411..67db91d87b9 100644
--- a/src/client/classic-debug/js/otp/locale/es.json
+++ b/src/client/classic-debug/js/otp/locale/es.json
@@ -155,7 +155,7 @@
"Train": "Tren",
"Ferry": "Barco",
"Light Rail": "Tranvía",
- "Cable Car": "Bus Tranvía",
+ "Cable Tram": "Bus Tranvía",
"Funicular": "Funicular",
"Aerial Tram": "Funicular",
"Airplane": "",
diff --git a/src/client/classic-debug/js/otp/locale/fr.json b/src/client/classic-debug/js/otp/locale/fr.json
index 53b4d78be17..76306ba7fe1 100644
--- a/src/client/classic-debug/js/otp/locale/fr.json
+++ b/src/client/classic-debug/js/otp/locale/fr.json
@@ -155,7 +155,7 @@
"Train": "Train",
"Ferry": "Ferry",
"Light Rail": "Tram ou Trolley",
- "Cable Car": "Tramway funiculaire",
+ "Cable Tram": "Tramway funiculaire",
"Funicular": "Funiculaire",
"Aerial Tram": "Téléphérique",
"Airplane": "",
diff --git a/src/client/classic-debug/js/otp/locale/hu.json b/src/client/classic-debug/js/otp/locale/hu.json
index 1e1e666e19e..022666bc938 100644
--- a/src/client/classic-debug/js/otp/locale/hu.json
+++ b/src/client/classic-debug/js/otp/locale/hu.json
@@ -155,7 +155,7 @@
"Train": "Vonat",
"Ferry": "Komp",
"Light Rail": "Villamos, könnyűvasút",
- "Cable Car": "",
+ "Cable Tram": "",
"Funicular": "Sikló",
"Aerial Tram": "Libegő",
"Airplane": "Repülőgép",
diff --git a/src/client/classic-debug/js/otp/locale/it.json b/src/client/classic-debug/js/otp/locale/it.json
index 0876aba1ef8..f1de09c1985 100644
--- a/src/client/classic-debug/js/otp/locale/it.json
+++ b/src/client/classic-debug/js/otp/locale/it.json
@@ -155,7 +155,7 @@
"Train": "treno",
"Ferry": "Ferry",
"Light Rail": "tram",
- "Cable Car": "tram",
+ "Cable Tram": "tram",
"Funicular": "funivia",
"Aerial Tram": "tram",
"Airplane": "",
diff --git a/src/client/classic-debug/js/otp/locale/no.json b/src/client/classic-debug/js/otp/locale/no.json
index 5a64e60d2a6..91013646c2c 100644
--- a/src/client/classic-debug/js/otp/locale/no.json
+++ b/src/client/classic-debug/js/otp/locale/no.json
@@ -155,7 +155,7 @@
"Train": "Tog",
"Ferry": "Ferje",
"Light Rail": "Trikk",
- "Cable Car": "Cable Car",
+ "Cable Tram": "Cable Car",
"Funicular": "Kabelbane",
"Aerial Tram": "Tau bane",
"Airplane": "Fly",
diff --git a/src/client/classic-debug/js/otp/locale/pl.json b/src/client/classic-debug/js/otp/locale/pl.json
index 5cf5a9c71b5..a8bbd03a0b9 100644
--- a/src/client/classic-debug/js/otp/locale/pl.json
+++ b/src/client/classic-debug/js/otp/locale/pl.json
@@ -161,7 +161,7 @@
"Train": "Pociąg",
"Ferry": "Prom",
"Light Rail": "Light Rail",
- "Cable Car": "Kolejka linowa",
+ "Cable Tram": "Kolejka linowa",
"Funicular": "Kolej linowo-terenowa",
"Aerial Tram": "Kolej linowa",
"Airplane": "",
diff --git a/src/client/classic-debug/js/otp/locale/pt.json b/src/client/classic-debug/js/otp/locale/pt.json
index 9d15e4afe1a..a4a5e9f6599 100644
--- a/src/client/classic-debug/js/otp/locale/pt.json
+++ b/src/client/classic-debug/js/otp/locale/pt.json
@@ -155,7 +155,7 @@
"Train": "Comboio",
"Ferry": "Ferry",
"Light Rail": "Ferroviário leve",
- "Cable Car": "Eléctrico",
+ "Cable Tram": "Eléctrico",
"Funicular": "Teleférico",
"Aerial Tram": "Teleférico",
"Airplane": "",
diff --git a/src/client/classic-debug/js/otp/locale/sl.json b/src/client/classic-debug/js/otp/locale/sl.json
index c99ad81f704..6019f19e228 100644
--- a/src/client/classic-debug/js/otp/locale/sl.json
+++ b/src/client/classic-debug/js/otp/locale/sl.json
@@ -167,7 +167,7 @@
"Train": "Vlak",
"Ferry": "",
"Light Rail": "Tramvaj",
- "Cable Car": "",
+ "Cable Tram": "",
"Funicular": "",
"Aerial Tram": "Gondola",
"Airplane": "",
diff --git a/src/client/classic-debug/js/otp/util/Itin.js b/src/client/classic-debug/js/otp/util/Itin.js
index 03555b1b3df..af8ce3a162b 100644
--- a/src/client/classic-debug/js/otp/util/Itin.js
+++ b/src/client/classic-debug/js/otp/util/Itin.js
@@ -221,9 +221,8 @@ otp.util.Itin = {
//TRANSLATORS: Tram, Streetcar, Light rail. Any light rail or street
//level system within a metropolitan area.
'TRAM' : _tr('Light Rail'),
- //TRANSLATORS: Used for street-level cable cars where the cable runs
- //beneath the car.
- 'CABLE_CAR': _tr('Cable Car'),
+ //TRANSLATORS: Used for street-level rail cars where the cable runs beneath the vehicle.
+ 'CABLE_CAR': _tr('Cable Tram'),
//TRANSLATORS: Any rail system designed for steep inclines.
'FUNICULAR': _tr('Funicular'),
//TRANSLATORS: Gondola, Suspended cable car. Typically used for aerial
diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiLeg.java b/src/ext/java/org/opentripplanner/ext/restapi/model/ApiLeg.java
index 7bbd83f7c2d..075038d441e 100644
--- a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiLeg.java
+++ b/src/ext/java/org/opentripplanner/ext/restapi/model/ApiLeg.java
@@ -98,7 +98,7 @@ public class ApiLeg {
/**
* For transit legs, the type of the route. Non transit -1 When 0-7: 0 Tram, 1 Subway, 2 Train, 3
- * Bus, 4 Ferry, 5 Cable Car, 6 Gondola, 7 Funicular When equal or highter than 100, it is coded
+ * Bus, 4 Ferry, 5 Cable Tram, 6 Gondola, 7 Funicular When equal or highter than 100, it is coded
* using the Hierarchical Vehicle Type (HVT) codes from the European TPEG standard Also see
* http://groups.google.com/group/gtfs-changes/msg/ed917a69cf8c5bef
*/
diff --git a/src/main/java/org/opentripplanner/model/plan/Leg.java b/src/main/java/org/opentripplanner/model/plan/Leg.java
index 2a0b6726560..9db7e4ffb04 100644
--- a/src/main/java/org/opentripplanner/model/plan/Leg.java
+++ b/src/main/java/org/opentripplanner/model/plan/Leg.java
@@ -284,7 +284,7 @@ default int getAgencyTimeZoneOffset() {
/**
* For transit legs, the type of the route. Non transit -1 When 0-7: 0 Tram, 1 Subway, 2 Train, 3
- * Bus, 4 Ferry, 5 Cable Car, 6 Gondola, 7 Funicular When equal or highter than 100, it is coded
+ * Bus, 4 Ferry, 5 Cable Tram, 6 Gondola, 7 Funicular When equal or highter than 100, it is coded
* using the Hierarchical Vehicle Type (HVT) codes from the European TPEG standard Also see
* http://groups.google.com/group/gtfs-changes/msg/ed917a69cf8c5bef
*/