diff --git a/osmo-bsc-latest/osmo-bsc.cfg b/osmo-bsc-latest/osmo-bsc.cfg
index 79d765fd..3d5a3d39 100644
--- a/osmo-bsc-latest/osmo-bsc.cfg
+++ b/osmo-bsc-latest/osmo-bsc.cfg
@@ -64,7 +64,7 @@ network
  timer t3113 10
  timer t3212 30
  bts 0
-  type sysmobts
+  type osmo-bts
   band DCS1800
   cell_identity 0
   location_area_code 1
@@ -153,7 +153,7 @@ network
     phys_chan_config PDCH
     hopping enabled 0
  bts 1
-  type sysmobts
+  type osmo-bts
   band DCS1800
   cell_identity 1
   location_area_code 2
@@ -242,7 +242,7 @@ network
     phys_chan_config PDCH
     hopping enabled 0
  bts 2
-  type sysmobts
+  type osmo-bts
   band DCS1800
   cell_identity 1
   location_area_code 1
diff --git a/osmo-bsc-master/osmo-bsc.cfg b/osmo-bsc-master/osmo-bsc.cfg
index 4d331ded..6af6d2aa 100644
--- a/osmo-bsc-master/osmo-bsc.cfg
+++ b/osmo-bsc-master/osmo-bsc.cfg
@@ -67,7 +67,7 @@ network
  timer t3113 10
  timer t3212 30
  bts 0
-  type sysmobts
+  type osmo-bts
   band DCS1800
   cell_identity 0
   location_area_code 1
diff --git a/osmo-dev-on-debian-sid/cfg/osmo-bsc.cfg b/osmo-dev-on-debian-sid/cfg/osmo-bsc.cfg
index 8b72dee9..19bde95b 100644
--- a/osmo-dev-on-debian-sid/cfg/osmo-bsc.cfg
+++ b/osmo-dev-on-debian-sid/cfg/osmo-bsc.cfg
@@ -8,7 +8,7 @@ network
   mgw remote-ip 127.0.0.1
   mgw remote-port 12427
  bts 0
-  type sysmobts
+  type osmo-bts
   band GSM-1800
   location_area_code 23
   ip.access unit_id 1800 0
diff --git a/osmo-nitb-latest/openbsc.cfg b/osmo-nitb-latest/openbsc.cfg
index 6166d7e8..980a5d66 100644
--- a/osmo-nitb-latest/openbsc.cfg
+++ b/osmo-nitb-latest/openbsc.cfg
@@ -95,7 +95,7 @@ network
  dyn_ts_allow_tch_f 0
  subscriber-keep-in-ram 0
  bts 0
-  type sysmobts
+  type osmo-bts
   band DCS1800
   cell_identity 20960
   location_area_code 13135
diff --git a/osmo-nitb-master/openbsc.cfg b/osmo-nitb-master/openbsc.cfg
index 6166d7e8..980a5d66 100644
--- a/osmo-nitb-master/openbsc.cfg
+++ b/osmo-nitb-master/openbsc.cfg
@@ -95,7 +95,7 @@ network
  dyn_ts_allow_tch_f 0
  subscriber-keep-in-ram 0
  bts 0
-  type sysmobts
+  type osmo-bts
   band DCS1800
   cell_identity 20960
   location_area_code 13135
diff --git a/osmo-ran/osmocom/osmo-bsc.cfg b/osmo-ran/osmocom/osmo-bsc.cfg
index bfc23f5b..265960ea 100644
--- a/osmo-ran/osmocom/osmo-bsc.cfg
+++ b/osmo-ran/osmocom/osmo-bsc.cfg
@@ -23,7 +23,7 @@ network
   mgw remote-ip 127.0.0.1
   mgw remote-port 2427
  bts 0
-  type sysmobts
+  type osmo-bts
   band DCS1800
   cell_identity 0
   location_area_code 5
diff --git a/osmo-ran/split/ran-bsc_mgw/osmocom/osmo-bsc.cfg b/osmo-ran/split/ran-bsc_mgw/osmocom/osmo-bsc.cfg
index b105eadd..dbdaeced 100644
--- a/osmo-ran/split/ran-bsc_mgw/osmocom/osmo-bsc.cfg
+++ b/osmo-ran/split/ran-bsc_mgw/osmocom/osmo-bsc.cfg
@@ -20,7 +20,7 @@ network
  handover1 maximum distance 9999
  periodic location update 30
  bts 0
-  type sysmobts
+  type osmo-bts
   band DCS1800
   cell_identity 0
   location_area_code 5
diff --git a/ttcn3-bsc-test-vamos/osmo-bsc.cfg b/ttcn3-bsc-test-vamos/osmo-bsc.cfg
index 98f13042..48f756ae 100644
--- a/ttcn3-bsc-test-vamos/osmo-bsc.cfg
+++ b/ttcn3-bsc-test-vamos/osmo-bsc.cfg
@@ -82,7 +82,7 @@ network
  mgw 0
   mgw remote-ip 172.18.31.203
  bts 0
-  type sysmobts
+  type osmo-bts
   band DCS1800
   cell_identity 0
   location_area_code 1
@@ -172,7 +172,7 @@ network
     phys_chan_config PDCH
     hopping enabled 0
  bts 1
-  type sysmobts
+  type osmo-bts
   band DCS1800
   cell_identity 1
   location_area_code 1
@@ -262,7 +262,7 @@ network
     phys_chan_config PDCH
     hopping enabled 0
  bts 2
-  type sysmobts
+  type osmo-bts
   band DCS1800
   cell_identity 1
   location_area_code 2
@@ -352,7 +352,7 @@ network
     phys_chan_config PDCH
     hopping enabled 0
  bts 3
-  type sysmobts
+  type osmo-bts
   band DCS1800
   cell_identity 3
   location_area_code 3
diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg
index 5902b1d3..7cd8e1d9 100644
--- a/ttcn3-bsc-test/osmo-bsc.cfg
+++ b/ttcn3-bsc-test/osmo-bsc.cfg
@@ -92,7 +92,7 @@ network
  mgw 0
   mgw remote-ip 172.18.2.203
  bts 0
-  type sysmobts
+  type osmo-bts
   band DCS1800
   cell_identity 0
   location_area_code 1
@@ -194,7 +194,7 @@ network
     phys_chan_config PDCH
     hopping enabled 0
  bts 1
-  type sysmobts
+  type osmo-bts
   band DCS1800
   cell_identity 1
   location_area_code 1
@@ -284,7 +284,7 @@ network
     phys_chan_config PDCH
     hopping enabled 0
  bts 2
-  type sysmobts
+  type osmo-bts
   band DCS1800
   cell_identity 1
   location_area_code 2
@@ -464,7 +464,7 @@ network
     phys_chan_config PDCH
     hopping enabled 0
  bts 3
-  type sysmobts
+  type osmo-bts
   band DCS1800
   cell_identity 3
   location_area_code 3
diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg
index 423f6d9b..1e293f0a 100644
--- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg
+++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg
@@ -81,7 +81,7 @@ network
  mgw 0
   mgw remote-ip 172.18.12.203
  bts 0
-  type sysmobts
+  type osmo-bts
   band DCS1800
   cell_identity 0
   location_area_code 1
@@ -171,7 +171,7 @@ network
     phys_chan_config PDCH
     hopping enabled 0
  bts 1
-  type sysmobts
+  type osmo-bts
   band DCS1800
   cell_identity 1
   location_area_code 1
@@ -261,7 +261,7 @@ network
     phys_chan_config PDCH
     hopping enabled 0
  bts 2
-  type sysmobts
+  type osmo-bts
   band DCS1800
   cell_identity 1
   location_area_code 2
@@ -441,7 +441,7 @@ network
     phys_chan_config PDCH
     hopping enabled 0
  bts 3
-  type sysmobts
+  type osmo-bts
   band DCS1800
   cell_identity 3
   location_area_code 3