diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 0a7fe11..40eb2bf 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -1960,14 +1960,14 @@
       type="mms"
   />
 
-  <apn carrier="GPRS Web"
+  <apn carrier="Internet"
       mcc="230"
       mnc="03"
       apn="internet"
       type="default,supl"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="MMS"
       mcc="230"
       mnc="03"
       apn="mms"
@@ -3645,6 +3645,8 @@
       mnc="03"
       apn="internet.tele2.ee"
       type="default,supl"
+      mvno_match_data="24803005x"
+      mvno_type="imsi"
   />
 
   <apn carrier="Tele2 MMS"
@@ -3655,6 +3657,41 @@
       mmsproxy="193.12.40.6"
       mmsport="8080"
       type="mms"
+      mvno_match_data="24803005x"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Smart/Ultra MMS"
+      mcc="248"
+      mnc="03"
+      apn="internet.tele2.ee"
+      mmsc="http://mmsc.tele2.ee"
+      mmsproxy="193.12.40.6"
+      mmsport="8080"
+      type="mms"
+      mvno_match_data="24803005x"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Tele2 Internet"
+      mcc="248"
+      mnc="03"
+      apn="internet.tele2.ee"
+      type="default,supl"
+      mvno_match_data="24803000x"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Smart/Ultra MMS"
+      mcc="248"
+      mnc="03"
+      apn="internet.tele2.ee"
+      mmsc="http://mmsc.tele2.ee"
+      mmsproxy="193.12.40.6"
+      mmsport="8080"
+      type="mms"
+      mvno_match_data="24803000x"
+      mvno_type="imsi"
   />
 
   <apn carrier="MTS Internet"
@@ -5137,13 +5174,12 @@
       type="mms"
   />
 
-  <apn carrier="PLAT-OTA-MMS"
+  <apn carrier="PLATMMS"
       mcc="310"
       mnc="100"
-      apn="plateaumms"
-      password="mmsc"
-      mmsc="208.254.124.11:8514"
-      mmsproxy="208.254.124.11"
+      apn="mms.plateau"
+      mmsc="http://mms"
+      mmsproxy="172.23.253.206"
       mmsport="8080"
       type="mms"
   />
@@ -5151,7 +5187,7 @@
   <apn carrier="PLATWEB"
       mcc="310"
       mnc="100"
-      apn="plateauweb"
+      apn="isp.plateau"
       type="default,supl"
   />
 
@@ -5758,7 +5794,7 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="Viaero Internet"
+  <apn carrier="Viaero Connect"
       mcc="310"
       mnc="450"
       apn="internet.vedge.com"
@@ -5896,13 +5932,20 @@
       type="mms"
   />
 
-  <apn carrier="ChinookMMS"
+  <apn carrier="Cellular One Smartphone"
       mcc="310"
       mnc="570"
-      apn="wapgw.chinookwireless.net"
-      mmsc="http://mms.cellonenation.net/mms/"
-      mmsproxy="204.181.155.195"
-      mmsport="8080"
+      apn="internet"
+      type="default,supl"
+  />
+
+  <apn carrier="Cellular One MMS"
+      mcc="310"
+      mnc="570"
+      apn="clearsky"
+      mmsc="http://mmsc.mtpcs.csky.us:6672/"
+      mmsproxy="209.4.229.229"
+      mmsport="9201"
       type="mms"
   />
 
@@ -6061,7 +6104,7 @@
       mnc="770"
       apn="wap1.iwireless.com"
       mmsc="http://mmsc.iwireless.dataonair.net:6672"
-      mmsproxy="209.4.229.32"
+      mmsproxy="209.4.229.31"
       mmsport="9401"
       type="mms"
   />
@@ -6142,11 +6185,20 @@
       type="default,supl,mms"
   />
 
+  <apn carrier="ISP"
+      mcc="311"
+      mnc="190"
+      apn="isp.cellular1.net"
+      type="default,supl"
+  />
+
   <apn carrier="MMS"
       mcc="311"
       mnc="190"
-      apn="wap.cellular1.net"
-      mmsc="http://mms.cellular1.net/ecit/mms.php"
+      apn="mms.cellular1.net"
+      mmsc="http://mms.cellular1.net"
+      mmsproxy="10.10.0.97"
+      mmsport="9201"
       type="mms"
   />
 
@@ -6184,6 +6236,27 @@
       type="mms"
   />
 
+  <apn carrier="ACS WEB"
+      mcc="311"
+      mnc="370"
+      apn="web.acs"
+      type="default,supl"
+      mvno_match_data="3113702"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="ACS MMS"
+      mcc="311"
+      mnc="370"
+      apn="mms.acs"
+      mmsc="http://mmsc.acsalaska.net"
+      mmsproxy="209.4.229.92"
+      mmsport="9201"
+      type="mms"
+      mvno_match_data="3113702"
+      mvno_type="imsi"
+  />
+
   <apn carrier="INTERNET CLARO"
       mcc="330"
       mnc="110"
@@ -6769,7 +6842,14 @@
       type="mms"
   />
 
-  <apn carrier="Orange net"
+  <apn carrier="Orange Internet (LTE)"
+      mcc="370"
+      mnc="01"
+      apn="orangeinternet"
+      type="ia,default,supl,dun"
+  />
+
+  <apn carrier="Orange net (3G)"
       mcc="370"
       mnc="01"
       apn="orangenet.com.do"
@@ -6819,7 +6899,7 @@
       type="mms"
   />
 
-  <apn carrier="Viva Edge"
+  <apn carrier="Viva Edge (GSM)"
       mcc="370"
       mnc="04"
       apn="edge.viva.net.do"
@@ -14643,7 +14723,7 @@
       mcc="450"
       mnc="05"
       apn="lte.sktelecom.com"
-      type="ia,default,mms,supl,fota,cbs"
+      type="default,mms,supl,fota,cbs"
       mmsc="http://omms.nate.com:9082/oma_mms"
       mmsproxy="smart.nate.com"
       mmsport="9093"
@@ -14750,7 +14830,7 @@
       mcc="450"
       mnc="08"
       apn="lte150.ktfwing.com"
-      type="ia,default,mms,supl,fota,cbs"
+      type="default,mms,supl,fota,cbs"
       mmsc="http://mmsc.ktfwing.com:9082"
       port="80"
       server="*"
@@ -19073,14 +19153,14 @@
       type="mms"
   />
 
-  <apn carrier="Kolbi 3G"
+  <apn carrier="KOLBI 3G"
       mcc="712"
       mnc="01"
       apn="kolbi3g"
       type="default,supl,dun"
   />
 
-  <apn carrier="Kolbi Multimedia"
+  <apn carrier="Kolbi_Multimedia"
       mcc="712"
       mnc="01"
       apn="kolbimundo"
@@ -19090,14 +19170,14 @@
       type="mms"
   />
 
-  <apn carrier="Kolbi 3G"
+  <apn carrier="KOLBI 3G"
       mcc="712"
       mnc="02"
       apn="kolbi3g"
       type="default,supl,dun"
   />
 
-  <apn carrier="Kolbi Multimedia"
+  <apn carrier="Kolbi_Multimedia"
       mcc="712"
       mnc="02"
       apn="kolbimundo"
@@ -19192,14 +19272,14 @@
       type="default,supl,dun"
   />
 
-  <apn carrier="Wap"
+  <apn carrier="Internet"
       mcc="714"
       mnc="01"
       apn="apn01.cwpanama.com.pa"
       type="default,supl,dun"
   />
 
-  <apn carrier="Mms"
+  <apn carrier="MMS"
       mcc="714"
       mnc="01"
       apn="apn02.cwpanama.com.pa"