diff --git a/p/bvg/index.js b/p/bvg/index.js
index c40043e3..d47acff2 100644
--- a/p/bvg/index.js
+++ b/p/bvg/index.js
@@ -1,6 +1,5 @@
 'use strict'
 
-const shorten = require('vbb-short-station-name')
 const {parseHook} = require('../../lib/profile-hooks')
 
 const parseAndAddLocationDHID = require('../vbb/parse-loc-dhid')
@@ -41,10 +40,6 @@ const journeyLegOccupancyCodes = new Map([
 ])
 
 const parseLocation = ({parsed}, l) => {
-	if ((parsed.type === 'stop' || parsed.type === 'station') && parsed.id[0] === '9') {
-		parsed.name = shorten(parsed.name)
-	}
-
 	parseAndAddLocationDHID(parsed, l)
 	return parsed
 }
@@ -146,7 +141,6 @@ const bvgProfile = {
 	products,
 
 	parseLocation: parseHook(_parseLocation, parseLocation),
-	parseStationName: (ctx, name) => shorten(name),
 	parseArrival: parseHook(
 		parseHook(_parseArrival, parseArrivalRenameRingbahn),
 		parseArrDepWithOccupancy,
diff --git a/test/e2e/bvg.js b/test/e2e/bvg.js
index 5e9fe0ee..8797e8b4 100644
--- a/test/e2e/bvg.js
+++ b/test/e2e/bvg.js
@@ -373,13 +373,13 @@ tap.test('nearby', async (t) => {
 	validate(t, nearby, 'locations', 'nearby')
 
 	t.equal(nearby[0].id, berlinerStr)
-	t.equal(nearby[0].name, 'U Berliner Str.')
+	t.equal(nearby[0].name, 'U Berliner Str. (Berlin)')
 	t.ok(nearby[0].distance > 0)
 	t.ok(nearby[0].distance < 100)
 
 	const res = nearby.find(s => s.id === landhausstr)
 	t.ok(res, `Landhausstr. ${landhausstr} is not among the nearby stops`)
-	t.equal(nearby[1].name, 'Landhausstr.')
+	t.equal(nearby[1].name, 'Landhausstr. (Berlin)')
 	t.ok(nearby[1].distance > 100)
 	t.ok(nearby[1].distance < 200)
 
diff --git a/test/fixtures/bvg-arrivals.js b/test/fixtures/bvg-arrivals.js
index 02663bfb..771e26cc 100644
--- a/test/fixtures/bvg-arrivals.js
+++ b/test/fixtures/bvg-arrivals.js
@@ -4,7 +4,7 @@ const sLandsbergerAllee = {
 	type: 'stop',
 	id: '900110004',
 	stationDHID: 'de:11000:900110004',
-	name: 'S Landsberger Allee',
+	name: 'S Landsberger Allee (Berlin)',
 	location: {
 		type: 'location',
 		id: '900110004',
@@ -302,7 +302,7 @@ module.exports = [
 		plannedPlatform: null,
 		prognosisType: 'prognosed',
 		direction: null,
-		provenance: 'Clara-Jaschke-Str.',
+		provenance: 'Clara-Jaschke-Str. (Berlin)',
 		origin: null,
 		destination: null,
 		line: {
@@ -339,7 +339,7 @@ module.exports = [
 		plannedPlatform: null,
 		prognosisType: 'calculated',
 		direction: null,
-		provenance: 'Ahrensfelde/Stadtgrenze',
+		provenance: 'Ahrensfelde/Stadtgrenze (Berlin)',
 		origin: null,
 		destination: null,
 		line: {
@@ -376,7 +376,7 @@ module.exports = [
 		plannedPlatform: null,
 		prognosisType: 'calculated',
 		direction: null,
-		provenance: 'Clara-Jaschke-Str.',
+		provenance: 'Clara-Jaschke-Str. (Berlin)',
 		origin: null,
 		destination: null,
 		line: {
@@ -413,7 +413,7 @@ module.exports = [
 		plannedPlatform: null,
 		prognosisType: 'prognosed',
 		direction: null,
-		provenance: 'Riesaer Str.',
+		provenance: 'Riesaer Str. (Berlin)',
 		origin: null,
 		destination: null,
 		line: {
@@ -450,7 +450,7 @@ module.exports = [
 		plannedPlatform: '2',
 		prognosisType: 'prognosed',
 		direction: null,
-		provenance: 'S Grünau',
+		provenance: 'S Grünau (Berlin)',
 		origin: null,
 		destination: null,
 		line: {
@@ -488,7 +488,7 @@ module.exports = [
 		plannedPlatform: '1',
 		prognosisType: 'prognosed',
 		direction: null,
-		provenance: 'S Südkreuz',
+		provenance: 'S Südkreuz Bhf (Berlin)',
 		origin: null,
 		destination: null,
 		line: {
@@ -527,7 +527,7 @@ module.exports = [
 		plannedPlatform: '2',
 		prognosisType: null,
 		direction: null,
-		provenance: 'S Südkreuz',
+		provenance: 'S Südkreuz Bhf (Berlin)',
 		origin: null,
 		destination: null,
 		line: {
@@ -566,7 +566,7 @@ module.exports = [
 		plannedPlatform: null,
 		prognosisType: 'prognosed',
 		direction: null,
-		provenance: 'S Hackescher Markt',
+		provenance: 'S Hackescher Markt (Berlin)',
 		origin: null,
 		destination: null,
 		line: {
@@ -603,7 +603,7 @@ module.exports = [
 		plannedPlatform: '2',
 		prognosisType: 'prognosed',
 		direction: null,
-		provenance: 'S Südkreuz',
+		provenance: 'S Südkreuz Bhf (Berlin)',
 		origin: null,
 		destination: null,
 		line: {
@@ -642,7 +642,7 @@ module.exports = [
 		plannedPlatform: null,
 		prognosisType: 'calculated',
 		direction: null,
-		provenance: 'Scharnweberstr./Weichselstr.',
+		provenance: 'Scharnweberstr./Weichselstr. (Berlin)',
 		origin: null,
 		destination: null,
 		line: {
@@ -679,7 +679,7 @@ module.exports = [
 		plannedPlatform: '1',
 		prognosisType: 'prognosed',
 		direction: null,
-		provenance: 'S Südkreuz',
+		provenance: 'S Südkreuz Bhf (Berlin)',
 		origin: null,
 		destination: null,
 		line: {
@@ -716,7 +716,7 @@ module.exports = [
 		plannedPlatform: '2',
 		prognosisType: null,
 		direction: null,
-		provenance: 'S Südkreuz',
+		provenance: 'S Südkreuz Bhf (Berlin)',
 		origin: null,
 		destination: null,
 		line: {
@@ -753,7 +753,7 @@ module.exports = [
 		plannedPlatform: null,
 		prognosisType: 'calculated',
 		direction: null,
-		provenance: 'Clara-Jaschke-Str.',
+		provenance: 'Clara-Jaschke-Str. (Berlin)',
 		origin: null,
 		destination: null,
 		line: {
@@ -792,7 +792,7 @@ module.exports = [
 		prognosedPlatform: null,
 		prognosisType: null,
 		direction: null,
-		provenance: 'S Birkenwerder',
+		provenance: 'S Birkenwerder Bhf',
 		origin: null,
 		destination: null,
 		line: {
@@ -840,7 +840,7 @@ module.exports = [
 		plannedPlatform: null,
 		prognosisType: 'calculated',
 		direction: null,
-		provenance: 'Ahrensfelde/Stadtgrenze',
+		provenance: 'Ahrensfelde/Stadtgrenze (Berlin)',
 		origin: null,
 		destination: null,
 		line: {
@@ -877,7 +877,7 @@ module.exports = [
 		plannedPlatform: null,
 		prognosisType: 'calculated',
 		direction: null,
-		provenance: 'Clara-Jaschke-Str.',
+		provenance: 'Clara-Jaschke-Str. (Berlin)',
 		origin: null,
 		destination: null,
 		line: {
@@ -914,7 +914,7 @@ module.exports = [
 		plannedPlatform: null,
 		prognosisType: 'calculated',
 		direction: null,
-		provenance: 'Riesaer Str.',
+		provenance: 'Riesaer Str. (Berlin)',
 		origin: null,
 		destination: null,
 		line: {
@@ -953,7 +953,7 @@ module.exports = [
 		prognosedPlatform: null,
 		prognosisType: null,
 		direction: null,
-		provenance: 'S Grünau',
+		provenance: 'S Grünau (Berlin)',
 		origin: null,
 		destination: null,
 		line: {
@@ -1023,7 +1023,7 @@ module.exports = [
 		plannedPlatform: '1',
 		prognosisType: 'prognosed',
 		direction: null,
-		provenance: 'S Südkreuz',
+		provenance: 'S Südkreuz Bhf (Berlin)',
 		origin: null,
 		destination: null,
 		line: {
@@ -1062,7 +1062,7 @@ module.exports = [
 		plannedPlatform: '2',
 		prognosisType: null,
 		direction: null,
-		provenance: 'S Südkreuz',
+		provenance: 'S Südkreuz Bhf (Berlin)',
 		origin: null,
 		destination: null,
 		line: {
@@ -1101,7 +1101,7 @@ module.exports = [
 		plannedPlatform: '2',
 		prognosisType: null,
 		direction: null,
-		provenance: 'S Südkreuz',
+		provenance: 'S Südkreuz Bhf (Berlin)',
 		origin: null,
 		destination: null,
 		line: {
@@ -1140,7 +1140,7 @@ module.exports = [
 		plannedPlatform: '2',
 		prognosisType: null,
 		direction: null,
-		provenance: 'S Südkreuz',
+		provenance: 'S Südkreuz Bhf (Berlin)',
 		origin: null,
 		destination: null,
 		line: {
@@ -1179,7 +1179,7 @@ module.exports = [
 		plannedPlatform: '2',
 		prognosisType: null,
 		direction: null,
-		provenance: 'S Südkreuz',
+		provenance: 'S Südkreuz Bhf (Berlin)',
 		origin: null,
 		destination: null,
 		line: {
@@ -1218,7 +1218,7 @@ module.exports = [
 		plannedPlatform: '2',
 		prognosisType: null,
 		direction: null,
-		provenance: 'S Südkreuz',
+		provenance: 'S Südkreuz Bhf (Berlin)',
 		origin: null,
 		destination: null,
 		line: {
diff --git a/test/fixtures/bvg-journey.js b/test/fixtures/bvg-journey.js
index 0b0dce0f..73793e5a 100644
--- a/test/fixtures/bvg-journey.js
+++ b/test/fixtures/bvg-journey.js
@@ -14,7 +14,7 @@ module.exports = {
 		destination: {
 			type: 'stop',
 			id: '900100007',
-			name: 'S Oranienburger Str.',
+			name: 'S Oranienburger Str. (Berlin)',
 			location: {
 				type: 'location',
 				id: '900100007',
@@ -44,7 +44,7 @@ module.exports = {
 		origin: {
 			type: 'stop',
 			id: '900100007',
-			name: 'S Oranienburger Str.',
+			name: 'S Oranienburger Str. (Berlin)',
 			location: {
 				type: 'location',
 				id: '900100007',
@@ -64,7 +64,7 @@ module.exports = {
 		destination: {
 			type: 'stop',
 			id: '900058101',
-			name: 'S Südkreuz',
+			name: 'S Südkreuz Bhf (Berlin)',
 			location: {
 				type: 'location',
 				id: '900058101',
@@ -98,7 +98,7 @@ module.exports = {
 					properties: {
 						type: 'stop',
 						id: '900100007',
-						name: 'S Oranienburger Str.',
+						name: 'S Oranienburger Str. (Berlin)',
 						location: {
 							type: 'location',
 							id: '900100007',
@@ -194,7 +194,7 @@ module.exports = {
 					properties: {
 						type: 'stop',
 						id: '900100001',
-						name: 'S+U Friedrichstr.',
+						name: 'S+U Friedrichstr. Bhf (Berlin)',
 						location: {
 							type: 'location',
 							id: '900100001',
@@ -301,7 +301,7 @@ module.exports = {
 					properties: {
 						type: 'stop',
 						id: '900100025',
-						name: 'S+U Brandenburger Tor',
+						name: 'S+U Brandenburger Tor (Berlin)',
 						location: {
 							type: 'location',
 							id: '900100025',
@@ -408,7 +408,7 @@ module.exports = {
 					properties: {
 						type: 'stop',
 						id: '900100020',
-						name: 'S+U Potsdamer Platz',
+						name: 'S+U Potsdamer Platz Bhf (Berlin)',
 						location: {
 							type: 'location',
 							id: '900100020',
@@ -449,7 +449,7 @@ module.exports = {
 					properties: {
 						type: 'stop',
 						id: '900012101',
-						name: 'S Anhalter Bahnhof',
+						name: 'S Anhalter Bahnhof (Berlin)',
 						location: {
 							type: 'location',
 							id: '900012101',
@@ -578,7 +578,7 @@ module.exports = {
 					properties: {
 						type: 'stop',
 						id: '900058103',
-						name: 'S+U Yorckstr. S2 S25 S26 U7',
+						name: 'S+U Yorckstr. S2 S25 S26 U7 (Berlin)',
 						location: {
 							type: 'location',
 							id: '900058103',
@@ -663,7 +663,7 @@ module.exports = {
 					properties: {
 						type: 'stop',
 						id: '900058101',
-						name: 'S Südkreuz',
+						name: 'S Südkreuz Bhf (Berlin)',
 						location: {
 							type: 'location',
 							id: '900058101',
@@ -707,7 +707,7 @@ module.exports = {
 				name: 'S-Bahn Berlin GmbH'
 			},
 		},
-		direction: 'S Blankenfelde (TF)',
+		direction: 'S Blankenfelde (TF) Bhf',
 		arrivalPlatform: '1',
 		plannedArrivalPlatform: '1',
 		departurePlatform: '1',
@@ -716,7 +716,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900100007',
-				name: 'S Oranienburger Str.',
+				name: 'S Oranienburger Str. (Berlin)',
 				location: {
 					type: 'location',
 					id: '900100007',
@@ -750,7 +750,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900100001',
-				name: 'S+U Friedrichstr.',
+				name: 'S+U Friedrichstr. Bhf (Berlin)',
 				location: {
 					type: 'location',
 					id: '900100001',
@@ -784,7 +784,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900100025',
-				name: 'S+U Brandenburger Tor',
+				name: 'S+U Brandenburger Tor (Berlin)',
 				location: {
 					type: 'location',
 					id: '900100025',
@@ -818,7 +818,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900100020',
-				name: 'S+U Potsdamer Platz',
+				name: 'S+U Potsdamer Platz Bhf (Berlin)',
 				location: {
 					type: 'location',
 					id: '900100020',
@@ -852,7 +852,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900012101',
-				name: 'S Anhalter Bahnhof',
+				name: 'S Anhalter Bahnhof (Berlin)',
 				location: {
 					type: 'location',
 					id: '900012101',
@@ -886,7 +886,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900058103',
-				name: 'S+U Yorckstr. S2 S25 S26 U7',
+				name: 'S+U Yorckstr. S2 S25 S26 U7 (Berlin)',
 				location: {
 					type: 'location',
 					id: '900058103',
@@ -920,7 +920,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900058101',
-				name: 'S Südkreuz',
+				name: 'S Südkreuz Bhf (Berlin)',
 				location: {
 					type: 'location',
 					id: '900058101',
diff --git a/test/fixtures/bvg-radar.js b/test/fixtures/bvg-radar.js
index a681ca4d..3a285f68 100644
--- a/test/fixtures/bvg-radar.js
+++ b/test/fixtures/bvg-radar.js
@@ -23,7 +23,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900100002',
-					name: 'S Hackescher Markt',
+					name: 'S Hackescher Markt (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100002',
@@ -57,7 +57,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900100026',
-					name: 'S+U Alexanderplatz/Gontardstr.',
+					name: 'S+U Alexanderplatz Bhf/Gontardstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100026',
@@ -91,7 +91,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900100005',
-					name: 'U Alexanderplatz [Tram]',
+					name: 'U Alexanderplatz (Berlin) [Tram]',
 					location: {
 						type: 'location',
 						id: '900100005',
@@ -125,7 +125,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900151003',
-					name: 'Zingster Str.',
+					name: 'Zingster Str. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900151003',
@@ -161,7 +161,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100026',
-					name: 'S+U Alexanderplatz/Gontardstr.',
+					name: 'S+U Alexanderplatz Bhf/Gontardstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100026',
@@ -181,7 +181,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100005',
-					name: 'U Alexanderplatz [Tram]',
+					name: 'U Alexanderplatz (Berlin) [Tram]',
 					location: {
 						type: 'location',
 						id: '900100005',
@@ -204,7 +204,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100026',
-					name: 'S+U Alexanderplatz/Gontardstr.',
+					name: 'S+U Alexanderplatz Bhf/Gontardstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100026',
@@ -224,7 +224,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100005',
-					name: 'U Alexanderplatz [Tram]',
+					name: 'U Alexanderplatz (Berlin) [Tram]',
 					location: {
 						type: 'location',
 						id: '900100005',
@@ -247,7 +247,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100026',
-					name: 'S+U Alexanderplatz/Gontardstr.',
+					name: 'S+U Alexanderplatz Bhf/Gontardstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100026',
@@ -267,7 +267,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100005',
-					name: 'U Alexanderplatz [Tram]',
+					name: 'U Alexanderplatz (Berlin) [Tram]',
 					location: {
 						type: 'location',
 						id: '900100005',
@@ -290,7 +290,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100026',
-					name: 'S+U Alexanderplatz/Gontardstr.',
+					name: 'S+U Alexanderplatz Bhf/Gontardstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100026',
@@ -310,7 +310,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100005',
-					name: 'U Alexanderplatz [Tram]',
+					name: 'U Alexanderplatz (Berlin) [Tram]',
 					location: {
 						type: 'location',
 						id: '900100005',
@@ -381,7 +381,7 @@ module.exports = [
 		}
 	},
 	{
-		direction: 'S Spandau',
+		direction: 'S Spandau Bhf (Berlin)',
 		tripId: '1|35835|39|86|19082019',
 		line: {
 			type: 'line',
@@ -402,7 +402,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900260005',
-					name: 'S Flughafen Berlin-Schönefeld',
+					name: 'S Flughafen Berlin-Schönefeld Bhf',
 					location: {
 						type: 'location',
 						id: '900260005',
@@ -436,7 +436,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900100003',
-					name: 'S+U Alexanderplatz',
+					name: 'S+U Alexanderplatz Bhf (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100003',
@@ -470,7 +470,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900100002',
-					name: 'S Hackescher Markt',
+					name: 'S Hackescher Markt (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100002',
@@ -504,7 +504,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900029101',
-					name: 'S Spandau',
+					name: 'S Spandau Bhf (Berlin)',
 					location: {
 						type: 'location',
 						id: '900029101',
@@ -540,7 +540,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100003',
-					name: 'S+U Alexanderplatz',
+					name: 'S+U Alexanderplatz Bhf (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100003',
@@ -560,7 +560,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100002',
-					name: 'S Hackescher Markt',
+					name: 'S Hackescher Markt (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100002',
@@ -583,7 +583,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100003',
-					name: 'S+U Alexanderplatz',
+					name: 'S+U Alexanderplatz Bhf (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100003',
@@ -603,7 +603,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100002',
-					name: 'S Hackescher Markt',
+					name: 'S Hackescher Markt (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100002',
@@ -626,7 +626,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100003',
-					name: 'S+U Alexanderplatz',
+					name: 'S+U Alexanderplatz Bhf (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100003',
@@ -646,7 +646,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100002',
-					name: 'S Hackescher Markt',
+					name: 'S Hackescher Markt (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100002',
@@ -669,7 +669,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100003',
-					name: 'S+U Alexanderplatz',
+					name: 'S+U Alexanderplatz Bhf (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100003',
@@ -689,7 +689,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100002',
-					name: 'S Hackescher Markt',
+					name: 'S Hackescher Markt (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100002',
@@ -760,7 +760,7 @@ module.exports = [
 		}
 	},
 	{
-		direction: 'S+U Hermannstr.',
+		direction: 'S+U Hermannstr. (Berlin)',
 		tripId: '1|31029|0|86|19082019',
 		line: {
 			type: 'line',
@@ -781,7 +781,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900085104',
-					name: 'U Paracelsus-Bad',
+					name: 'U Paracelsus-Bad (Berlin)',
 					location: {
 						type: 'location',
 						id: '900085104',
@@ -815,7 +815,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900100705',
-					name: 'S+U Alexanderplatz [U8]',
+					name: 'S+U Alexanderplatz (Berlin) [U8]',
 					location: {
 						type: 'location',
 						id: '900100705',
@@ -849,7 +849,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900100004',
-					name: 'S+U Jannowitzbrücke',
+					name: 'S+U Jannowitzbrücke (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100004',
@@ -883,7 +883,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900079221',
-					name: 'S+U Hermannstr.',
+					name: 'S+U Hermannstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900079221',
@@ -919,7 +919,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100705',
-					name: 'S+U Alexanderplatz [U8]',
+					name: 'S+U Alexanderplatz (Berlin) [U8]',
 					location: {
 						type: 'location',
 						id: '900100705',
@@ -939,7 +939,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100004',
-					name: 'S+U Jannowitzbrücke',
+					name: 'S+U Jannowitzbrücke (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100004',
@@ -962,7 +962,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100705',
-					name: 'S+U Alexanderplatz [U8]',
+					name: 'S+U Alexanderplatz (Berlin) [U8]',
 					location: {
 						type: 'location',
 						id: '900100705',
@@ -982,7 +982,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100004',
-					name: 'S+U Jannowitzbrücke',
+					name: 'S+U Jannowitzbrücke (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100004',
@@ -1005,7 +1005,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100705',
-					name: 'S+U Alexanderplatz [U8]',
+					name: 'S+U Alexanderplatz (Berlin) [U8]',
 					location: {
 						type: 'location',
 						id: '900100705',
@@ -1025,7 +1025,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100004',
-					name: 'S+U Jannowitzbrücke',
+					name: 'S+U Jannowitzbrücke (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100004',
@@ -1048,7 +1048,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100705',
-					name: 'S+U Alexanderplatz [U8]',
+					name: 'S+U Alexanderplatz (Berlin) [U8]',
 					location: {
 						type: 'location',
 						id: '900100705',
@@ -1068,7 +1068,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100004',
-					name: 'S+U Jannowitzbrücke',
+					name: 'S+U Jannowitzbrücke (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100004',
@@ -1160,7 +1160,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900175004',
-					name: 'U Kaulsdorf-Nord',
+					name: 'U Kaulsdorf-Nord (Berlin)',
 					location: {
 						type: 'location',
 						id: '900175004',
@@ -1194,7 +1194,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900100017',
-					name: 'U Schillingstr.',
+					name: 'U Schillingstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100017',
@@ -1228,7 +1228,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900100704',
-					name: 'S+U Alexanderplatz [U5]',
+					name: 'S+U Alexanderplatz (Berlin) [U5]',
 					location: {
 						type: 'location',
 						id: '900100704',
@@ -1262,7 +1262,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900100704',
-					name: 'S+U Alexanderplatz [U5]',
+					name: 'S+U Alexanderplatz (Berlin) [U5]',
 					location: {
 						type: 'location',
 						id: '900100704',
@@ -1298,7 +1298,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100017',
-					name: 'U Schillingstr.',
+					name: 'U Schillingstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100017',
@@ -1318,7 +1318,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100704',
-					name: 'S+U Alexanderplatz [U5]',
+					name: 'S+U Alexanderplatz (Berlin) [U5]',
 					location: {
 						type: 'location',
 						id: '900100704',
@@ -1341,7 +1341,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100017',
-					name: 'U Schillingstr.',
+					name: 'U Schillingstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100017',
@@ -1361,7 +1361,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100704',
-					name: 'S+U Alexanderplatz [U5]',
+					name: 'S+U Alexanderplatz (Berlin) [U5]',
 					location: {
 						type: 'location',
 						id: '900100704',
@@ -1384,7 +1384,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100017',
-					name: 'U Schillingstr.',
+					name: 'U Schillingstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100017',
@@ -1404,7 +1404,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100704',
-					name: 'S+U Alexanderplatz [U5]',
+					name: 'S+U Alexanderplatz (Berlin) [U5]',
 					location: {
 						type: 'location',
 						id: '900100704',
@@ -1427,7 +1427,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100017',
-					name: 'U Schillingstr.',
+					name: 'U Schillingstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100017',
@@ -1447,7 +1447,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100704',
-					name: 'S+U Alexanderplatz [U5]',
+					name: 'S+U Alexanderplatz (Berlin) [U5]',
 					location: {
 						type: 'location',
 						id: '900100704',
@@ -1518,7 +1518,7 @@ module.exports = [
 		}
 	},
 	{
-		direction: 'S+U Pankow',
+		direction: 'S+U Pankow (Berlin)',
 		tripId: '1|30095|5|86|19082019',
 		line: {
 			type: 'line',
@@ -1539,7 +1539,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900026201',
-					name: 'U Theodor-Heuss-Platz',
+					name: 'U Theodor-Heuss-Platz (Berlin)',
 					location: {
 						type: 'location',
 						id: '900026201',
@@ -1573,7 +1573,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900100015',
-					name: 'U Klosterstr.',
+					name: 'U Klosterstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100015',
@@ -1607,7 +1607,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900100703',
-					name: 'S+U Alexanderplatz [U2]',
+					name: 'S+U Alexanderplatz (Berlin) [U2]',
 					location: {
 						type: 'location',
 						id: '900100703',
@@ -1641,7 +1641,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900130002',
-					name: 'S+U Pankow',
+					name: 'S+U Pankow (Berlin)',
 					location: {
 						type: 'location',
 						id: '900130002',
@@ -1677,7 +1677,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100015',
-					name: 'U Klosterstr.',
+					name: 'U Klosterstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100015',
@@ -1697,7 +1697,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100703',
-					name: 'S+U Alexanderplatz [U2]',
+					name: 'S+U Alexanderplatz (Berlin) [U2]',
 					location: {
 						type: 'location',
 						id: '900100703',
@@ -1720,7 +1720,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100015',
-					name: 'U Klosterstr.',
+					name: 'U Klosterstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100015',
@@ -1740,7 +1740,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100703',
-					name: 'S+U Alexanderplatz [U2]',
+					name: 'S+U Alexanderplatz (Berlin) [U2]',
 					location: {
 						type: 'location',
 						id: '900100703',
@@ -1763,7 +1763,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100015',
-					name: 'U Klosterstr.',
+					name: 'U Klosterstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100015',
@@ -1783,7 +1783,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100703',
-					name: 'S+U Alexanderplatz [U2]',
+					name: 'S+U Alexanderplatz (Berlin) [U2]',
 					location: {
 						type: 'location',
 						id: '900100703',
@@ -1806,7 +1806,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100015',
-					name: 'U Klosterstr.',
+					name: 'U Klosterstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100015',
@@ -1826,7 +1826,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100703',
-					name: 'S+U Alexanderplatz [U2]',
+					name: 'S+U Alexanderplatz (Berlin) [U2]',
 					location: {
 						type: 'location',
 						id: '900100703',
@@ -1918,7 +1918,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900100002',
-					name: 'S Hackescher Markt',
+					name: 'S Hackescher Markt (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100002',
@@ -1952,7 +1952,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900100005',
-					name: 'U Alexanderplatz [Tram]',
+					name: 'U Alexanderplatz (Berlin) [Tram]',
 					location: {
 						type: 'location',
 						id: '900100005',
@@ -1986,7 +1986,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900100040',
-					name: 'Mollstr./Otto-Braun-Str.',
+					name: 'Mollstr./Otto-Braun-Str. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100040',
@@ -2020,7 +2020,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900175013',
-					name: 'Riesaer Str.',
+					name: 'Riesaer Str. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900175013',
@@ -2056,7 +2056,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100005',
-					name: 'U Alexanderplatz [Tram]',
+					name: 'U Alexanderplatz (Berlin) [Tram]',
 					location: {
 						type: 'location',
 						id: '900100005',
@@ -2076,7 +2076,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100040',
-					name: 'Mollstr./Otto-Braun-Str.',
+					name: 'Mollstr./Otto-Braun-Str. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100040',
@@ -2099,7 +2099,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100005',
-					name: 'U Alexanderplatz [Tram]',
+					name: 'U Alexanderplatz (Berlin) [Tram]',
 					location: {
 						type: 'location',
 						id: '900100005',
@@ -2119,7 +2119,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100040',
-					name: 'Mollstr./Otto-Braun-Str.',
+					name: 'Mollstr./Otto-Braun-Str. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100040',
@@ -2142,7 +2142,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100005',
-					name: 'U Alexanderplatz [Tram]',
+					name: 'U Alexanderplatz (Berlin) [Tram]',
 					location: {
 						type: 'location',
 						id: '900100005',
@@ -2162,7 +2162,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100040',
-					name: 'Mollstr./Otto-Braun-Str.',
+					name: 'Mollstr./Otto-Braun-Str. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100040',
@@ -2185,7 +2185,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100005',
-					name: 'U Alexanderplatz [Tram]',
+					name: 'U Alexanderplatz (Berlin) [Tram]',
 					location: {
 						type: 'location',
 						id: '900100005',
@@ -2205,7 +2205,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100040',
-					name: 'Mollstr./Otto-Braun-Str.',
+					name: 'Mollstr./Otto-Braun-Str. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100040',
@@ -2297,7 +2297,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900175013',
-					name: 'Riesaer Str.',
+					name: 'Riesaer Str. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900175013',
@@ -2331,7 +2331,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900100026',
-					name: 'S+U Alexanderplatz/Gontardstr.',
+					name: 'S+U Alexanderplatz Bhf/Gontardstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100026',
@@ -2365,7 +2365,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900100515',
-					name: 'Spandauer Str./Marienkirche',
+					name: 'Spandauer Str./Marienkirche (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100515',
@@ -2399,7 +2399,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900100002',
-					name: 'S Hackescher Markt',
+					name: 'S Hackescher Markt (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100002',
@@ -2435,7 +2435,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100026',
-					name: 'S+U Alexanderplatz/Gontardstr.',
+					name: 'S+U Alexanderplatz Bhf/Gontardstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100026',
@@ -2455,7 +2455,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100515',
-					name: 'Spandauer Str./Marienkirche',
+					name: 'Spandauer Str./Marienkirche (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100515',
@@ -2478,7 +2478,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100026',
-					name: 'S+U Alexanderplatz/Gontardstr.',
+					name: 'S+U Alexanderplatz Bhf/Gontardstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100026',
@@ -2498,7 +2498,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100515',
-					name: 'Spandauer Str./Marienkirche',
+					name: 'Spandauer Str./Marienkirche (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100515',
@@ -2521,7 +2521,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100026',
-					name: 'S+U Alexanderplatz/Gontardstr.',
+					name: 'S+U Alexanderplatz Bhf/Gontardstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100026',
@@ -2541,7 +2541,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100515',
-					name: 'Spandauer Str./Marienkirche',
+					name: 'Spandauer Str./Marienkirche (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100515',
@@ -2564,7 +2564,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100026',
-					name: 'S+U Alexanderplatz/Gontardstr.',
+					name: 'S+U Alexanderplatz Bhf/Gontardstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100026',
@@ -2584,7 +2584,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100515',
-					name: 'Spandauer Str./Marienkirche',
+					name: 'Spandauer Str./Marienkirche (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100515',
@@ -2676,7 +2676,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900151003',
-					name: 'Zingster Str.',
+					name: 'Zingster Str. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900151003',
@@ -2710,7 +2710,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900100040',
-					name: 'Mollstr./Otto-Braun-Str.',
+					name: 'Mollstr./Otto-Braun-Str. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100040',
@@ -2744,7 +2744,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900100005',
-					name: 'U Alexanderplatz [Tram]',
+					name: 'U Alexanderplatz (Berlin) [Tram]',
 					location: {
 						type: 'location',
 						id: '900100005',
@@ -2778,7 +2778,7 @@ module.exports = [
 				stop: {
 					type: 'stop',
 					id: '900003259',
-					name: 'Lüneburger Str.',
+					name: 'Lüneburger Str. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900003259',
@@ -2814,7 +2814,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100040',
-					name: 'Mollstr./Otto-Braun-Str.',
+					name: 'Mollstr./Otto-Braun-Str. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100040',
@@ -2834,7 +2834,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100005',
-					name: 'U Alexanderplatz [Tram]',
+					name: 'U Alexanderplatz (Berlin) [Tram]',
 					location: {
 						type: 'location',
 						id: '900100005',
@@ -2857,7 +2857,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100040',
-					name: 'Mollstr./Otto-Braun-Str.',
+					name: 'Mollstr./Otto-Braun-Str. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100040',
@@ -2877,7 +2877,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100005',
-					name: 'U Alexanderplatz [Tram]',
+					name: 'U Alexanderplatz (Berlin) [Tram]',
 					location: {
 						type: 'location',
 						id: '900100005',
@@ -2900,7 +2900,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100040',
-					name: 'Mollstr./Otto-Braun-Str.',
+					name: 'Mollstr./Otto-Braun-Str. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100040',
@@ -2920,7 +2920,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100005',
-					name: 'U Alexanderplatz [Tram]',
+					name: 'U Alexanderplatz (Berlin) [Tram]',
 					location: {
 						type: 'location',
 						id: '900100005',
@@ -2943,7 +2943,7 @@ module.exports = [
 				origin: {
 					type: 'stop',
 					id: '900100040',
-					name: 'Mollstr./Otto-Braun-Str.',
+					name: 'Mollstr./Otto-Braun-Str. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100040',
@@ -2963,7 +2963,7 @@ module.exports = [
 				destination: {
 					type: 'stop',
 					id: '900100005',
-					name: 'U Alexanderplatz [Tram]',
+					name: 'U Alexanderplatz (Berlin) [Tram]',
 					location: {
 						type: 'location',
 						id: '900100005',
diff --git a/test/fixtures/bvg-trip-with-occupancy.js b/test/fixtures/bvg-trip-with-occupancy.js
index e6dcb18f..f40de73d 100644
--- a/test/fixtures/bvg-trip-with-occupancy.js
+++ b/test/fixtures/bvg-trip-with-occupancy.js
@@ -104,7 +104,7 @@ module.exports = {
 	origin: {
 		type: 'stop',
 		id: '900009102',
-		name: 'U Leopoldplatz',
+		name: 'U Leopoldplatz (Berlin)',
 		location: {
 			type: 'location',
 			id: '900009102',
@@ -131,7 +131,7 @@ module.exports = {
 	destination: {
 		type: 'stop',
 		id: '900120005',
-		name: 'S Ostbahnhof',
+		name: 'S Ostbahnhof (Berlin)',
 		location: {
 			type: 'location',
 			id: '900120005',
@@ -163,7 +163,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900009102',
-					name: 'U Leopoldplatz',
+					name: 'U Leopoldplatz (Berlin)',
 					location: {
 						type: 'location',
 						id: '900009102',
@@ -187,7 +187,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900009151',
-					name: 'Gerichtstr.',
+					name: 'Gerichtstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900009151',
@@ -211,7 +211,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900009104',
-					name: 'S+U Wedding',
+					name: 'S+U Wedding (Berlin)',
 					location: {
 						type: 'location',
 						id: '900009104',
@@ -245,7 +245,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900008104',
-					name: 'U Reinickendorfer Str./Fennstr.',
+					name: 'U Reinickendorfer Str./Fennstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900008104',
@@ -269,7 +269,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900001202',
-					name: 'Am Nordhafen',
+					name: 'Am Nordhafen (Berlin)',
 					location: {
 						type: 'location',
 						id: '900001202',
@@ -318,7 +318,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900001252',
-					name: 'Friedrich-Krause-Ufer',
+					name: 'Friedrich-Krause-Ufer (Berlin)',
 					location: {
 						type: 'location',
 						id: '900001252',
@@ -347,7 +347,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900001206',
-					name: 'Heidestr.',
+					name: 'Heidestr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900001206',
@@ -376,7 +376,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900001203',
-					name: 'Döberitzer Str.',
+					name: 'Döberitzer Str. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900001203',
@@ -479,7 +479,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900100503',
-					name: 'Invalidenpark',
+					name: 'Invalidenpark (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100503',
@@ -513,7 +513,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900100542',
-					name: 'Charité - Campus Mitte',
+					name: 'Charité - Campus Mitte (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100542',
@@ -537,7 +537,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900100033',
-					name: 'Schumannstr.',
+					name: 'Schumannstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100033',
@@ -566,7 +566,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900100509',
-					name: 'Deutsches Theater',
+					name: 'Deutsches Theater (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100509',
@@ -590,7 +590,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900100047',
-					name: 'Friedrichstr./Reinhardtstr.',
+					name: 'Friedrichstr./Reinhardtstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100047',
@@ -624,7 +624,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900100001',
-					name: 'S+U Friedrichstr.',
+					name: 'S+U Friedrichstr. Bhf (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100001',
@@ -653,7 +653,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900100513',
-					name: 'U Unter den Linden',
+					name: 'U Unter den Linden (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100513',
@@ -687,7 +687,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900100027',
-					name: 'Französische Str.',
+					name: 'Französische Str. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100027',
@@ -711,7 +711,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900100530',
-					name: 'Werderscher Markt',
+					name: 'Werderscher Markt (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100530',
@@ -745,7 +745,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900100052',
-					name: 'Berliner Schloss',
+					name: 'Berliner Schloss (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100052',
@@ -774,7 +774,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900100531',
-					name: 'Neumannsgasse',
+					name: 'Neumannsgasse (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100531',
@@ -798,7 +798,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900100726',
-					name: 'Fischerinsel.',
+					name: 'Fischerinsel. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100726',
@@ -827,7 +827,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900100014',
-					name: 'U Märkisches Museum',
+					name: 'U Märkisches Museum (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100014',
@@ -856,7 +856,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900100032',
-					name: 'Heinrich-Heine-Str./Annenstr.',
+					name: 'Heinrich-Heine-Str./Annenstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100032',
@@ -885,7 +885,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900100544',
-					name: 'Heinrich-Heine-Platz',
+					name: 'Heinrich-Heine-Platz (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100544',
@@ -929,7 +929,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900100546',
-					name: 'Adalbertstr.',
+					name: 'Adalbertstr. (Berlin)',
 					location: {
 						type: 'location',
 						id: '900100546',
@@ -978,7 +978,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900014107',
-					name: 'Bethaniendamm',
+					name: 'Bethaniendamm (Berlin)',
 					location: {
 						type: 'location',
 						id: '900014107',
@@ -1027,7 +1027,7 @@ module.exports = {
 				properties: {
 					type: 'stop',
 					id: '900120005',
-					name: 'S Ostbahnhof',
+					name: 'S Ostbahnhof (Berlin)',
 					location: {
 						type: 'location',
 						id: '900120005',
@@ -1054,7 +1054,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900009102',
-				name: 'U Leopoldplatz',
+				name: 'U Leopoldplatz (Berlin)',
 				location: {
 					type: 'location',
 					id: '900009102',
@@ -1096,7 +1096,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900009151',
-				name: 'Gerichtstr.',
+				name: 'Gerichtstr. (Berlin)',
 				location: {
 					type: 'location',
 					id: '900009151',
@@ -1132,7 +1132,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900009104',
-				name: 'S+U Wedding',
+				name: 'S+U Wedding (Berlin)',
 				location: {
 					type: 'location',
 					id: '900009104',
@@ -1174,7 +1174,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900008104',
-				name: 'U Reinickendorfer Str./Fennstr.',
+				name: 'U Reinickendorfer Str./Fennstr. (Berlin)',
 				location: {
 					type: 'location',
 					id: '900008104',
@@ -1210,7 +1210,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900001202',
-				name: 'Am Nordhafen',
+				name: 'Am Nordhafen (Berlin)',
 				location: {
 					type: 'location',
 					id: '900001202',
@@ -1246,7 +1246,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900001252',
-				name: 'Friedrich-Krause-Ufer',
+				name: 'Friedrich-Krause-Ufer (Berlin)',
 				location: {
 					type: 'location',
 					id: '900001252',
@@ -1282,7 +1282,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900001206',
-				name: 'Heidestr.',
+				name: 'Heidestr. (Berlin)',
 				location: {
 					type: 'location',
 					id: '900001206',
@@ -1318,7 +1318,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900001203',
-				name: 'Döberitzer Str.',
+				name: 'Döberitzer Str. (Berlin)',
 				location: {
 					type: 'location',
 					id: '900001203',
@@ -1396,7 +1396,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900100503',
-				name: 'Invalidenpark',
+				name: 'Invalidenpark (Berlin)',
 				location: {
 					type: 'location',
 					id: '900100503',
@@ -1432,7 +1432,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900100542',
-				name: 'Charité - Campus Mitte',
+				name: 'Charité - Campus Mitte (Berlin)',
 				location: {
 					type: 'location',
 					id: '900100542',
@@ -1468,7 +1468,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900100033',
-				name: 'Schumannstr.',
+				name: 'Schumannstr. (Berlin)',
 				location: {
 					type: 'location',
 					id: '900100033',
@@ -1504,7 +1504,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900100509',
-				name: 'Deutsches Theater',
+				name: 'Deutsches Theater (Berlin)',
 				location: {
 					type: 'location',
 					id: '900100509',
@@ -1540,7 +1540,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900100047',
-				name: 'Friedrichstr./Reinhardtstr.',
+				name: 'Friedrichstr./Reinhardtstr. (Berlin)',
 				location: {
 					type: 'location',
 					id: '900100047',
@@ -1576,7 +1576,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900100001',
-				name: 'S+U Friedrichstr.',
+				name: 'S+U Friedrichstr. Bhf (Berlin)',
 				location: {
 					type: 'location',
 					id: '900100001',
@@ -1618,7 +1618,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900100513',
-				name: 'U Unter den Linden',
+				name: 'U Unter den Linden (Berlin)',
 				location: {
 					type: 'location',
 					id: '900100513',
@@ -1654,7 +1654,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900100027',
-				name: 'Französische Str.',
+				name: 'Französische Str. (Berlin)',
 				location: {
 					type: 'location',
 					id: '900100027',
@@ -1690,7 +1690,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900100530',
-				name: 'Werderscher Markt',
+				name: 'Werderscher Markt (Berlin)',
 				location: {
 					type: 'location',
 					id: '900100530',
@@ -1726,7 +1726,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900100052',
-				name: 'Berliner Schloss',
+				name: 'Berliner Schloss (Berlin)',
 				location: {
 					type: 'location',
 					id: '900100052',
@@ -1762,7 +1762,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900100531',
-				name: 'Neumannsgasse',
+				name: 'Neumannsgasse (Berlin)',
 				location: {
 					type: 'location',
 					id: '900100531',
@@ -1798,7 +1798,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900100726',
-				name: 'Fischerinsel.',
+				name: 'Fischerinsel. (Berlin)',
 				location: {
 					type: 'location',
 					id: '900100726',
@@ -1834,7 +1834,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900100014',
-				name: 'U Märkisches Museum',
+				name: 'U Märkisches Museum (Berlin)',
 				location: {
 					type: 'location',
 					id: '900100014',
@@ -1870,7 +1870,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900100032',
-				name: 'Heinrich-Heine-Str./Annenstr.',
+				name: 'Heinrich-Heine-Str./Annenstr. (Berlin)',
 				location: {
 					type: 'location',
 					id: '900100032',
@@ -1906,7 +1906,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900100544',
-				name: 'Heinrich-Heine-Platz',
+				name: 'Heinrich-Heine-Platz (Berlin)',
 				location: {
 					type: 'location',
 					id: '900100544',
@@ -1942,7 +1942,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900100546',
-				name: 'Adalbertstr.',
+				name: 'Adalbertstr. (Berlin)',
 				location: {
 					type: 'location',
 					id: '900100546',
@@ -1978,7 +1978,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900014107',
-				name: 'Bethaniendamm',
+				name: 'Bethaniendamm (Berlin)',
 				location: {
 					type: 'location',
 					id: '900014107',
@@ -2014,7 +2014,7 @@ module.exports = {
 			stop: {
 				type: 'stop',
 				id: '900120005',
-				name: 'S Ostbahnhof',
+				name: 'S Ostbahnhof (Berlin)',
 				location: {
 					type: 'location',
 					id: '900120005',