diff --git a/data/common/common.yaml b/data/common/common.yaml
--- a/data/common/common.yaml
+++ b/data/common/common.yaml
@@ -17,10 +17,10 @@
   'internal.staging.swh.network.': "%{alias('dns::local_nameservers')}"
   '128.168.192.in-addr.arpa.': "%{alias('dns::local_nameservers')}"
 
-# dns::forwarders per-location. No Default value
-# dns::local_nameservers per-location. No Default value
+# dns::forwarders per-subnet. No Default value
+# dns::local_nameservers per-subnet. No Default value
 
-# ntp::servers per-location. Default value:
+# ntp::servers per-subnet. Default value:
 ntp::servers:
   - 0.debian.pool.ntp.org
   - 1.debian.pool.ntp.org
@@ -29,7 +29,7 @@
 
 sudo::configs: {}
 
-# smtp::relay_hostname is per-location. Default value:
+# smtp::relay_hostname is per-subnet. Default value:
 smtp::relay_hostname: 'pergamon.internal.softwareheritage.org'
 
 smtp::relayhost: "[%{lookup('smtp::relay_hostname')}]"
diff --git a/data/location/azure_euwest.yaml b/data/subnets/azure_euwest.yaml
rename from data/location/azure_euwest.yaml
rename to data/subnets/azure_euwest.yaml
diff --git a/data/location/inria_paris.yaml b/data/subnets/inria_paris.yaml
rename from data/location/inria_paris.yaml
rename to data/subnets/inria_paris.yaml
diff --git a/data/location/sesi_rocquencourt.yaml b/data/subnets/sesi_rocquencourt.yaml
rename from data/location/sesi_rocquencourt.yaml
rename to data/subnets/sesi_rocquencourt.yaml
diff --git a/data/location/sesi_rocquencourt_staging.yaml b/data/subnets/sesi_rocquencourt_staging.yaml
rename from data/location/sesi_rocquencourt_staging.yaml
rename to data/subnets/sesi_rocquencourt_staging.yaml
diff --git a/data/location/unibo.yaml b/data/subnets/unibo.yaml
rename from data/location/unibo.yaml
rename to data/subnets/unibo.yaml
diff --git a/data/location/vagrant.yaml b/data/subnets/vagrant.yaml
rename from data/location/vagrant.yaml
rename to data/subnets/vagrant.yaml
diff --git a/hiera.yaml b/hiera.yaml
--- a/hiera.yaml
+++ b/hiera.yaml
@@ -6,12 +6,12 @@
 hierarchy:
   - path: "private/hostname/%{trusted.certname}.yaml"
     name: "Per hostname private credentials override"
-  - path: "private/location/%{::location}.yaml"
-    name: "Per location private credentials override"
   - path: "hostname/%{trusted.certname}.yaml"
     name: "Per hostname override configuration"
-  - path: "location/%{::location}.yaml"
-    name: "Per location override configuration"
+  - path: "private/subnets/%{::subnet}.yaml"
+    name: "Per subnet private credentials"
+  - path: "subnets/%{::subnet}.yaml"
+    name: "Per subnet settings"
   - path: "private/common.yaml"
     name: "Common private credentials"
   - glob: "common/*.yaml"