diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
index 7474dee7..3cc2b1ea 100644
--- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
@@ -1245,6 +1245,10 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 				return 'R' + type;
 			if ("RR".equals(type)) // RR 371 Horehronec / RR 404 Vltava / RR 922 Josef Skupa
 				return 'R' + type;
+			if ("ZAB1/766".equals(type))
+				return "R" + name;
+			if ("ZAB2/768".equals(type))
+				return "R" + name;
 
 			if ("BSB".equals(type)) // Breisgau-S-Bahn
 				return 'S' + str;
diff --git a/enabler/src/de/schildbach/pte/NaldoProvider.java b/enabler/src/de/schildbach/pte/NaldoProvider.java
index 184c4241..977731df 100644
--- a/enabler/src/de/schildbach/pte/NaldoProvider.java
+++ b/enabler/src/de/schildbach/pte/NaldoProvider.java
@@ -59,11 +59,6 @@ public class NaldoProvider extends AbstractEfaProvider
 	@Override
 	protected String parseLine(final String mot, final String name, final String longName, final String noTrainName)
 	{
-		if ("ZAB1/766".equals(name))
-			return "R" + name;
-		if ("ZAB2/768".equals(name))
-			return "R" + name;
-
 		return super.parseLine(mot, name, longName, noTrainName);
 	}
 }