diff --git a/country-overrides/override-a1.txt b/country-overrides/override-a1.txt
index 98c7f74..dd07087 100644
--- a/country-overrides/override-a1.txt
+++ b/country-overrides/override-a1.txt
@@ -18,92 +18,92 @@
 # Please keep this file sorted.
 #
 
-net:				AS4224
+asnum:				AS4224
 descr:				The Calyx Institue
 remarks:			Tor relay provider
 is-anonymous-proxy:	yes
 
-net:				AS8427
+asnum:				AS8427
 descr:				Maginfo
 remarks:			VPN provider
 is-anonymous-proxy:	yes
 
-net:				AS10914
+asnum:				AS10914
 descr:				Cypherpunk Privacy Network
 remarks:			VPN provider
 is-anonymous-proxy:	yes
 
-net:				AS23762
+asnum:				AS23762
 descr:				VPNsolutions Pty Ltd
 remarks:			VPN provider
 is-anonymous-proxy:	yes
 
-net:				AS37560
+asnum:				AS37560
 descr:				Cyberdyne S.A.
 remarks:			VPN and Tor relay provider
 is-anonymous-proxy:	yes
 
-net:				AS38814
+asnum:				AS38814
 descr:				Asiamax Ltd. VPN
 remarks:			VPN provider
 is-anonymous-proxy:	yes
 
-net:				AS51852
+asnum:				AS51852
 descr:				Private Layer INC
 remarks:			VPN provider
 is-anonymous-proxy:	yes
 
-net:				AS58546
+asnum:				AS58546
 descr:				Astrill VPN
 remarks:			VPN provider
 is-anonymous-proxy:	yes
 
-net:				AS60729
+asnum:				AS60729
 descr:				Zwiebelfreunde e.V.
 remarks:			Tor relay provider
 is-anonymous-proxy:	yes
 
-net:				AS62744
+asnum:				AS62744
 descr:				Quintex Alliance Consulting
 remarks:			Tor relay provider
 is-anonymous-proxy:	yes
 
-net:				AS201665
+asnum:				AS201665
 descr:				Anonymizer, Inc.
 remarks:			VPN provider
 is-anonymous-proxy:	yes
 
-net:				AS206106
+asnum:				AS206106
 descr:				Privacy Ukraine LLC
 remarks:			VPN provider
 is-anonymous-proxy:	yes
 
-net:				AS208294
+asnum:				AS208294
 descr:				Markus Koch
 remarks:			Tor relay provider
 is-anonymous-proxy:	yes
 
-net:				AS208323
+asnum:				AS208323
 descr:				Foundation for Applied Privacy
 remarks:			Tor relay provider
 is-anonymous-proxy:	yes
 
-net:				AS208476
+asnum:				AS208476
 descr:				Danilenko, Artyom
 remarks:			(Rogue) VPN provider
 is-anonymous-proxy:	yes
 
-net:				AS209623
+asnum:				AS209623
 descr:				David Craig
 remarks:			(Rogue) VPN provider
 is-anonymous-proxy:	yes
 
-net:				AS394087
+asnum:				AS394087
 descr:				Secure Internet LLC / PureVPN
 remarks:			VPN provider
 is-anonymous-proxy:	yes
 
-net:				AS396507
+asnum:				AS396507
 descr:				Emerald Onion
 remarks:			Tor relay provider
 is-anonymous-proxy:	yes
diff --git a/country-overrides/override-a2.txt b/country-overrides/override-a2.txt
index e6cdda1..309afcd 100644
--- a/country-overrides/override-a2.txt
+++ b/country-overrides/override-a2.txt
@@ -12,172 +12,172 @@
 # Please keep this file sorted.
 #
 
-net:					AS4913
+asnum:					AS4913
 descr:					Speedcast Communications, Inc.
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS5666
+asnum:					AS5666
 descr:					Speedcast Communications, Inc.
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS9229
+asnum:					AS9229
 descr:					Speedcast Limited
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS10434
+asnum:					AS10434
 descr:					Satellite Communication Systems, Inc.
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS12684
+asnum:					AS12684
 descr:					SES ASTRA S.A.
 remarks:				Satellite Internet provider [several satellite dial-in pools]
 is-satellite-provider:	yes
 
-net:					AS15829
+asnum:					AS15829
 descr:					Eutelsat S.A.
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS16360
+asnum:					AS16360
 descr:					Signalhorn Trusted Networks GmbH / Satlynx
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS19036
+asnum:					AS19036
 descr:					Telesat Network Services Inc.
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS21310
+asnum:					AS21310
 descr:					Satellite Ltd.
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS22184
+asnum:					AS22184
 descr:					IRIDIUM SATELLITE, LLC
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS25222
+asnum:					AS25222
 descr:					Inmarsat Solutions B.V.
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS29137
+asnum:					AS29137
 descr:					Eutelsat S.A.
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS29286
+asnum:					AS29286
 descr:					SKYLOGIC S.P.A.
 remarks:				Satellite Internet provider [several satellite dial-in pools]
 is-satellite-provider:	yes
 
-net:					AS31515
+asnum:					AS31515
 descr:					INMARSAT GLOBAL LIMITED
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS31753
+asnum:					AS31753
 descr:					Inmarsat Government
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS37296
+asnum:					AS37296
 descr:					Afcom Satellite Networks Nigeria Limited
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS38172
+asnum:					AS38172
 descr:					IPSTAR Australia Pty. Ltd.
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS39356
+asnum:					AS39356
 descr:					Avanti Broadband Ltd
 remarks:				Satellite Internet provider [several satellite dial-in pools]
 is-satellite-provider:	yes
 
-net:					AS34444
+asnum:					AS34444
 descr:					Eutelsat S.A.
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS39151
+asnum:					AS39151
 descr:					AXESS Networks Solutions Germany GmbH / CeTEL GmbH / GeoLink
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS41659
+asnum:					AS41659
 descr:					Arab Satellite Communications Organization
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS43905
+asnum:					AS43905
 descr:					Telenor Satellite AS
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS45232
+asnum:					AS45232
 descr:					Spacenet Internet Services Pvt. Ltd.
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS45603
+asnum:					AS45603
 descr:					Orion Satellite Systems
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS47339
+asnum:					AS47339
 descr:					Speedcast Europe B.V.
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS47965
+asnum:					AS47965
 descr:					Signalhorn Trusted Networks GmbH
 remarks:				Satellite Internet provider [high confidence, but not proofed]
 is-satellite-provider:	yes
 
-net:					AS56262
+asnum:					AS56262
 descr:					Dagupan Urban Satellite Vision Inc.
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS56804
+asnum:					AS56804
 descr:					Gilat Satellite Networks Ltd.
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS58265
+asnum:					AS58265
 descr:					Level421 GmbH
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS57490
+asnum:					AS57490
 descr:					Satellite Telecom LTD.
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS62023
+asnum:					AS62023
 descr:					NYNEX satellite OHG
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS135324
+asnum:					AS135324
 descr:					IPStar
 remarks:				Satellite Internet provider [high confidence, but not proofed]
 is-satellite-provider:	yes
 
-net:					AS393582
+asnum:					AS393582
 descr:					VIDEO DIRECT SATELLITE & ENTERTAINMENT / WisperISP
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
 
-net:					AS393944
+asnum:					AS393944
 descr:					Inmarsat Solutions US Inc
 remarks:				Satellite Internet provider
 is-satellite-provider:	yes
