From 36e8a62617f956afb94014179d30c390810d342f Mon Sep 17 00:00:00 2001
From: Meng Wang <mewan@google.com>
Date: Mon, 20 Mar 2017 11:21:07 -0700
Subject: [PATCH] Rename "VZWIMS" apn to "IMS"

Bug: 35948995
Test: make
Change-Id: Ie06ba500b64903dcc1db031b35fe17d66cf92838
---
 apns-full-conf.xml | 222 ++++++++++++++++++++++-----------------------
 1 file changed, 111 insertions(+), 111 deletions(-)

diff --git a/apns-full-conf.xml b/apns-full-conf.xml
index 111fe30a..84ac569b 100644
--- a/apns-full-conf.xml
+++ b/apns-full-conf.xml
@@ -111,7 +111,7 @@
   <apn carrier="Test IMS"
       mcc="001"
       mnc="01"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       authtype="0"
       protocol="IPV4V6"
@@ -200,7 +200,7 @@
   <apn carrier="Test IMS"
       mcc="001"
       mnc="010"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       authtype="0"
       protocol="IPV4V6"
@@ -469,7 +469,7 @@
   <apn carrier="LTE - VZW Roaming IMS"
       mcc="204"
       mnc="04"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       authtype="0"
       protocol="IPV4V6"
@@ -485,7 +485,7 @@
   <apn carrier="EHRPD - VZW Roaming IMS"
       mcc="204"
       mnc="04"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       authtype="0"
       protocol="IPV4V6"
@@ -5153,7 +5153,7 @@
   <apn carrier="Test IMS"
       mcc="246"
       mnc="081"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -5163,7 +5163,7 @@
   <apn carrier="Test IMS"
       mcc="246"
       mnc="081"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -5292,7 +5292,7 @@
   <apn carrier="Test IMS"
       mcc="246"
       mnc="81"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -5306,7 +5306,7 @@
   <apn carrier="Test IMS"
       mcc="246"
       mnc="81"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -7389,7 +7389,7 @@
   <apn carrier="Bluewire IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="bluewire"
@@ -7401,7 +7401,7 @@
   <apn carrier="Bluewire IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="bluewire"
@@ -7483,7 +7483,7 @@
   <apn carrier="Flatwire IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="flatwire"
@@ -7495,7 +7495,7 @@
   <apn carrier="Flatwire IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="flatwire"
@@ -7577,7 +7577,7 @@
   <apn carrier="Mobipcs IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="mobipcs"
@@ -7589,7 +7589,7 @@
   <apn carrier="Mobipcs IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="mobipcs"
@@ -7671,7 +7671,7 @@
   <apn carrier="Mobilenation IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="mobilenation"
@@ -7683,7 +7683,7 @@
   <apn carrier="Mobilenation IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="mobilenation"
@@ -7765,7 +7765,7 @@
   <apn carrier="Mohave IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="mohave"
@@ -7777,7 +7777,7 @@
   <apn carrier="Mohave IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="mohave"
@@ -7859,7 +7859,7 @@
   <apn carrier="Peopleswire IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="Peopleswire"
@@ -7871,7 +7871,7 @@
   <apn carrier="Peopleswire IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="Peopleswire"
@@ -7953,7 +7953,7 @@
   <apn carrier="Revol IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="revol"
@@ -7965,7 +7965,7 @@
   <apn carrier="Revol IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="revol"
@@ -8063,7 +8063,7 @@
   <apn carrier="Distribution IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="distribution"
@@ -8075,7 +8075,7 @@
   <apn carrier="Distribution IMS"
       mcc="310"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="distribution"
@@ -8219,7 +8219,7 @@
   <apn carrier="Verizon IMS"
       mcc="310"
       mnc="004"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims"
       protocol="IPV4V6"
       roaming_protocol="IPV6"
@@ -8268,7 +8268,7 @@
   <apn carrier=" ALU Test-SIM IMS"
       mcc="310"
       mnc="028"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -8322,7 +8322,7 @@
   <apn carrier="Itewire IMS"
       mcc="310"
       mnc="032"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="itewire"
@@ -8334,7 +8334,7 @@
   <apn carrier="Itewire IMS"
       mcc="310"
       mnc="032"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="itewire"
@@ -8416,7 +8416,7 @@
   <apn carrier="Etex IMS"
       mcc="310"
       mnc="035"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="etex"
@@ -8428,7 +8428,7 @@
   <apn carrier="Etex IMS"
       mcc="310"
       mnc="035"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="etex"
@@ -8510,7 +8510,7 @@
   <apn carrier="Mta IMS"
       mcc="310"
       mnc="040"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="mta"
@@ -8522,7 +8522,7 @@
   <apn carrier="Mta IMS"
       mcc="310"
       mnc="040"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="mta"
@@ -8604,7 +8604,7 @@
   <apn carrier="Alaskacomm IMS"
       mcc="310"
       mnc="050"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="alaskacomm"
@@ -8616,7 +8616,7 @@
   <apn carrier="Alaskacomm IMS"
       mcc="310"
       mnc="050"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="alaskacomm"
@@ -8840,7 +8840,7 @@
   <apn carrier="Carolina IMS"
       mcc="310"
       mnc="130"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="carolinawest"
@@ -8852,7 +8852,7 @@
   <apn carrier="Carolina IMS"
       mcc="310"
       mnc="130"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="carolinawest"
@@ -9828,7 +9828,7 @@
   <apn carrier="Alltel2 IMS"
       mcc="310"
       mnc="330"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="alltel2"
@@ -9840,7 +9840,7 @@
   <apn carrier="Alltel2 IMS"
       mcc="310"
       mnc="330"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="alltel2"
@@ -9922,7 +9922,7 @@
   <apn carrier="Pioneer IMS"
       mcc="310"
       mnc="360"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="pioneer"
@@ -9934,7 +9934,7 @@
   <apn carrier="Pioneer IMS"
       mcc="310"
       mnc="360"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="pioneer"
@@ -10157,7 +10157,7 @@
   <apn carrier="Gci IMS"
       mcc="310"
       mnc="430"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="gci"
@@ -10169,7 +10169,7 @@
   <apn carrier="Gci IMS"
       mcc="310"
       mnc="430"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="gci"
@@ -10553,7 +10553,7 @@
   <apn carrier="Inland IMS"
       mcc="310"
       mnc="580"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="inland"
@@ -10565,7 +10565,7 @@
   <apn carrier="Inland IMS"
       mcc="310"
       mnc="580"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="inland"
@@ -10714,7 +10714,7 @@
   <apn carrier="Cellcom IMS"
       mcc="310"
       mnc="600"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="cellcom"
@@ -10726,7 +10726,7 @@
   <apn carrier="Cellcom IMS"
       mcc="310"
       mnc="600"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="cellcom"
@@ -10961,7 +10961,7 @@
   <apn carrier="Appalachian IMS"
       mcc="310"
       mnc="750"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="appalachian"
@@ -10973,7 +10973,7 @@
   <apn carrier="Appalachian IMS"
       mcc="310"
       mnc="750"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="appalachian"
@@ -11138,7 +11138,7 @@
   <apn carrier="Nepa IMS"
       mcc="310"
       mnc="820"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="nepa"
@@ -11150,7 +11150,7 @@
   <apn carrier="Nepa IMS"
       mcc="310"
       mnc="820"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="nepa"
@@ -11276,7 +11276,7 @@
   <apn carrier="Midrivers IMS"
       mcc="310"
       mnc="900"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="midrivers"
@@ -11288,7 +11288,7 @@
   <apn carrier="Midrivers IMS"
       mcc="310"
       mnc="900"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="midrivers"
@@ -11379,7 +11379,7 @@
   <apn carrier="Jamesvalley IMS"
       mcc="310"
       mnc="920"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="jamesvalley"
@@ -11391,7 +11391,7 @@
   <apn carrier="Jamesvalley IMS"
       mcc="310"
       mnc="920"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="jamesvalley"
@@ -11473,7 +11473,7 @@
   <apn carrier="Coppervalley IMS"
       mcc="310"
       mnc="930"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="coppervalley"
@@ -11485,7 +11485,7 @@
   <apn carrier="Coppervalley IMS"
       mcc="310"
       mnc="930"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="coppervalley"
@@ -11567,7 +11567,7 @@
   <apn carrier="Nntcwire IMS"
       mcc="310"
       mnc="960"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="nntcwire"
@@ -11579,7 +11579,7 @@
   <apn carrier="Nntcwire IMS"
       mcc="310"
       mnc="960"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="nntcwire"
@@ -11661,7 +11661,7 @@
   <apn carrier="Silverstar IMS"
       mcc="310"
       mnc="960"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="silverstar"
@@ -11673,7 +11673,7 @@
   <apn carrier="Silverstar IMS"
       mcc="310"
       mnc="960"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="silverstar"
@@ -11755,7 +11755,7 @@
   <apn carrier="Snakeriver IMS"
       mcc="310"
       mnc="960"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="snakeriver"
@@ -11767,7 +11767,7 @@
   <apn carrier="Snakeriver IMS"
       mcc="310"
       mnc="960"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="snakeriver"
@@ -11849,7 +11849,7 @@
   <apn carrier="Southcentral IMS"
       mcc="310"
       mnc="960"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="southcentral"
@@ -11861,7 +11861,7 @@
   <apn carrier="Southcentral IMS"
       mcc="310"
       mnc="960"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="southcentral"
@@ -11943,7 +11943,7 @@
   <apn carrier="Strata IMS"
       mcc="310"
       mnc="960"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="strata"
@@ -11955,7 +11955,7 @@
   <apn carrier="Strata IMS"
       mcc="310"
       mnc="960"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="strata"
@@ -12037,7 +12037,7 @@
   <apn carrier="Syringa IMS"
       mcc="310"
       mnc="960"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="syringa"
@@ -12049,7 +12049,7 @@
   <apn carrier="Syringa IMS"
       mcc="310"
       mnc="960"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="syringa"
@@ -12131,7 +12131,7 @@
   <apn carrier="Thumb IMS"
       mcc="311"
       mnc="050"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="thumbcellular"
@@ -12143,7 +12143,7 @@
   <apn carrier="Thumb IMS"
       mcc="311"
       mnc="050"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="thumbcellular"
@@ -12225,7 +12225,7 @@
   <apn carrier="Elementmobile IMS"
       mcc="311"
       mnc="070"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="elementmobile"
@@ -12237,7 +12237,7 @@
   <apn carrier="Elementmobile IMS"
       mcc="311"
       mnc="070"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="elementmobile"
@@ -12339,7 +12339,7 @@
   <apn carrier="Sprocket IMS"
       mcc="311"
       mnc="140"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="sprocket"
@@ -12351,7 +12351,7 @@
   <apn carrier="Sprocket IMS"
       mcc="311"
       mnc="140"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="sprocket"
@@ -12952,7 +12952,7 @@
   <apn carrier="Leaco IMS"
       mcc="311"
       mnc="310"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="leaco"
@@ -12964,7 +12964,7 @@
   <apn carrier="Leaco IMS"
       mcc="311"
       mnc="310"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="leaco"
@@ -13046,7 +13046,7 @@
   <apn carrier="Illinois IMS"
       mcc="311"
       mnc="340"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="illinoisvalley"
@@ -13058,7 +13058,7 @@
   <apn carrier="Illinois IMS"
       mcc="311"
       mnc="340"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="illinoisvalley"
@@ -13140,7 +13140,7 @@
   <apn carrier="Nemont IMS"
       mcc="311"
       mnc="350"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="nemont"
@@ -13152,7 +13152,7 @@
   <apn carrier="Nemont IMS"
       mcc="311"
       mnc="350"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="nemont"
@@ -13320,7 +13320,7 @@
   <apn carrier="Ericsson Test-SIM IMS"
       mcc="311"
       mnc="390"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       authtype="0"
       protocol="IPV4V6"
@@ -13335,7 +13335,7 @@
   <apn carrier="Ericsson Test-SIM IMS"
       mcc="311"
       mnc="390"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       authtype="0"
       protocol="IPV4V6"
@@ -13398,7 +13398,7 @@
   <apn carrier="Chatmobrsa2 IMS"
       mcc="311"
       mnc="410"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="chatmobrsa2"
@@ -13410,7 +13410,7 @@
   <apn carrier="Chatmobrsa2 IMS"
       mcc="311"
       mnc="410"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="chatmobrsa2"
@@ -13492,7 +13492,7 @@
   <apn carrier="NW IMS"
       mcc="311"
       mnc="420"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="northwestcell"
@@ -13504,7 +13504,7 @@
   <apn carrier="NW IMS"
       mcc="311"
       mnc="420"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="northwestcell"
@@ -13586,7 +13586,7 @@
   <apn carrier="Chatmobrsa1 IMS"
       mcc="311"
       mnc="430"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="chatmobrsa1"
@@ -13598,7 +13598,7 @@
   <apn carrier="Chatmobrsa1 IMS"
       mcc="311"
       mnc="430"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="chatmobrsa1"
@@ -13680,7 +13680,7 @@
   <apn carrier="Bluegrass IMS"
       mcc="311"
       mnc="440"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="bluegrass"
@@ -13692,7 +13692,7 @@
   <apn carrier="Bluegrass IMS"
       mcc="311"
       mnc="440"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="bluegrass"
@@ -13774,7 +13774,7 @@
   <apn carrier="Ptci IMS"
       mcc="311"
       mnc="450"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="ptci"
@@ -13786,7 +13786,7 @@
   <apn carrier="Ptci IMS"
       mcc="311"
       mnc="450"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="ptci"
@@ -13903,7 +13903,7 @@
   <apn carrier="Verizon"
       mcc="311"
       mnc="480"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       authtype="0"
       protocol="IPV4V6"
@@ -14484,7 +14484,7 @@
   <apn carrier="Gsc IMS"
       mcc="311"
       mnc="590"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="gsc"
@@ -14496,7 +14496,7 @@
   <apn carrier="Gsc IMS"
       mcc="311"
       mnc="590"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="gsc"
@@ -14578,7 +14578,7 @@
   <apn carrier="Cox IMS"
       mcc="311"
       mnc="600"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="cox"
@@ -14590,7 +14590,7 @@
   <apn carrier="Cox IMS"
       mcc="311"
       mnc="600"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="cox"
@@ -14672,7 +14672,7 @@
   <apn carrier="Srtcomm IMS"
       mcc="311"
       mnc="610"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="srtcomm"
@@ -14684,7 +14684,7 @@
   <apn carrier="Srtcomm IMS"
       mcc="311"
       mnc="610"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="srtcomm"
@@ -14766,7 +14766,7 @@
   <apn carrier="United IMS"
       mcc="311"
       mnc="650"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="unitedwireless"
@@ -14778,7 +14778,7 @@
   <apn carrier="United IMS"
       mcc="311"
       mnc="650"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="unitedwireless"
@@ -14860,7 +14860,7 @@
   <apn carrier="Pinebelt IMS"
       mcc="311"
       mnc="670"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="pinebelt"
@@ -14872,7 +14872,7 @@
   <apn carrier="Pinebelt IMS"
       mcc="311"
       mnc="670"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="pinebelt"
@@ -14974,7 +14974,7 @@
   <apn carrier="Chariton IMS"
       mcc="311"
       mnc="920"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="charitonvalley"
@@ -14986,7 +14986,7 @@
   <apn carrier="Chariton IMS"
       mcc="311"
       mnc="920"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="charitonvalley"
@@ -15080,7 +15080,7 @@
   <apn carrier="Custer IMS"
       mcc="312"
       mnc="040"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="custer"
@@ -15092,7 +15092,7 @@
   <apn carrier="Custer IMS"
       mcc="312"
       mnc="040"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="custer"
@@ -15174,7 +15174,7 @@
   <apn carrier="Chatmobility IMS"
       mcc="312"
       mnc="160"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="chatmobility"
@@ -15186,7 +15186,7 @@
   <apn carrier="Chatmobility IMS"
       mcc="312"
       mnc="160"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="chatmobility"
@@ -15346,7 +15346,7 @@
   <apn carrier="Openmobile IMS"
       mcc="330"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="openmobile"
@@ -15358,7 +15358,7 @@
   <apn carrier="Openmobile IMS"
       mcc="330"
       mnc="000"
-      apn="VZWIMS"
+      apn="IMS"
       type="ims,ia"
       mvno_type="spn"
       mvno_match_data="openmobile"