gb: update Vodafone UK APNs

BUG=chrome-os-partner:20783
TEST=xmllint --valid --noout serviceproviders.xml
TEST=Run unit tests

Change-Id: I07b3ef7b8fb2a9cb62f3027f8dc63d6c142d62b1
Reviewed-on: https://gerrit.chromium.org/gerrit/62613
Reviewed-by: Thieu Le <thieule@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
diff --git a/serviceproviders.xml b/serviceproviders.xml
index c2db329..707dcf2 100644
--- a/serviceproviders.xml
+++ b/serviceproviders.xml
@@ -3989,7 +3989,7 @@
 		</gsm>
 	</provider>
 	<provider>
-		<name>Vodafone</name>
+		<name>Vodafone UK</name>
 		<gsm>
 			<network-id mcc="234" mnc="15"/>
 			<msisdn-query>
@@ -4003,35 +4003,44 @@
 			<apn value="internet">
 				<plan type="postpaid"/>
 				<usage type="internet"/>
-				<name>Contract</name>
+				<name>Contract Internet</name>
 				<username>web</username>
 				<password>web</password>
 				<dns>10.206.65.68</dns>
 				<dns>10.203.65.68</dns>
 			</apn>
+			<apn value="ppbundle.internet">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>PAYG Internet Bundle</name>
+				<username>web</username>
+				<password>web</password>
+				<dns>10.203.129.68</dns>
+				<dns>10.203.129.68</dns>
+			</apn>
+			<apn value="smart">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>PAYG Internet</name>
+				<username>web</username>
+				<password>web</password>
+			</apn>
+			<apn value="pp.internet">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>PAYG Internet</name>
+				<username>web</username>
+				<password>web</password>
+			</apn>
 			<apn value="pp.vodafone.co.uk">
 				<plan type="prepaid"/>
 				<usage type="internet"/>
-				<name>Prepaid</name>
+				<name>PAYG WAP</name>
 				<username>web</username>
 				<password>web</password>
 				<dns>172.29.1.11</dns>
 				<dns>172.29.1.11</dns>
 			</apn>
-			<apn value="ppbundle.internet">
-				<plan type="postpaid"/>
-				<usage type="internet"/>
-				<name>TopUp and Go</name>
-				<username>web</username>
-				<password>web</password>
-				<dns>10.203.129.68</dns>
-				<dns>10.203.129.68</dns>
-			</apn>
-			<apn value="pp.internet">
-				<plan type="postpaid"/>
-				<usage type="internet"/>
-				<name>TopUp and Go (older 1GB SIMs)</name>
-			</apn>
 		</gsm>
 	</provider>
 	<provider>