diff --git a/features/nanostack/nanostack-interface/targets/TARGET_Freescale/TARGET_KW41Z/NanostackRfPhyKw41z.cpp b/connectivity/drivers/802.15.4_RF/TARGET_Freescale/TARGET_KW41Z/NanostackRfPhyKw41z.cpp
similarity index 100%
rename from features/nanostack/nanostack-interface/targets/TARGET_Freescale/TARGET_KW41Z/NanostackRfPhyKw41z.cpp
rename to connectivity/drivers/802.15.4_RF/TARGET_Freescale/TARGET_KW41Z/NanostackRfPhyKw41z.cpp
diff --git a/features/nanostack/nanostack-interface/targets/TARGET_Freescale/TARGET_KW41Z/NanostackRfPhyKw41z.h b/connectivity/drivers/802.15.4_RF/TARGET_Freescale/TARGET_KW41Z/NanostackRfPhyKw41z.h
similarity index 100%
rename from features/nanostack/nanostack-interface/targets/TARGET_Freescale/TARGET_KW41Z/NanostackRfPhyKw41z.h
rename to connectivity/drivers/802.15.4_RF/TARGET_Freescale/TARGET_KW41Z/NanostackRfPhyKw41z.h
diff --git a/connectivity/drivers/802.15.4_RF/TARGET_Freescale/TARGET_KW41Z/mbed_lib.json b/connectivity/drivers/802.15.4_RF/TARGET_Freescale/TARGET_KW41Z/mbed_lib.json
new file mode 100644
index 0000000000..ce3d225924
--- /dev/null
+++ b/connectivity/drivers/802.15.4_RF/TARGET_Freescale/TARGET_KW41Z/mbed_lib.json
@@ -0,0 +1,3 @@
+{
+    "name": "ns-kw41z-rf"
+}
diff --git a/features/nanostack/nanostack-interface/targets/TARGET_Silicon_Labs/TARGET_SL_RAIL/NanostackRfPhyEfr32.cpp b/connectivity/drivers/802.15.4_RF/TARGET_Silicon_Labs/TARGET_SL_RAIL/NanostackRfPhyEfr32.cpp
similarity index 100%
rename from features/nanostack/nanostack-interface/targets/TARGET_Silicon_Labs/TARGET_SL_RAIL/NanostackRfPhyEfr32.cpp
rename to connectivity/drivers/802.15.4_RF/TARGET_Silicon_Labs/TARGET_SL_RAIL/NanostackRfPhyEfr32.cpp
diff --git a/features/nanostack/nanostack-interface/targets/TARGET_Silicon_Labs/TARGET_SL_RAIL/NanostackRfPhyEfr32.h b/connectivity/drivers/802.15.4_RF/TARGET_Silicon_Labs/TARGET_SL_RAIL/NanostackRfPhyEfr32.h
similarity index 100%
rename from features/nanostack/nanostack-interface/targets/TARGET_Silicon_Labs/TARGET_SL_RAIL/NanostackRfPhyEfr32.h
rename to connectivity/drivers/802.15.4_RF/TARGET_Silicon_Labs/TARGET_SL_RAIL/NanostackRfPhyEfr32.h
diff --git a/connectivity/drivers/802.15.4_RF/TARGET_Silicon_Labs/TARGET_SL_RAIL/mbed_lib.json b/connectivity/drivers/802.15.4_RF/TARGET_Silicon_Labs/TARGET_SL_RAIL/mbed_lib.json
new file mode 100644
index 0000000000..4547bda3cf
--- /dev/null
+++ b/connectivity/drivers/802.15.4_RF/TARGET_Silicon_Labs/TARGET_SL_RAIL/mbed_lib.json
@@ -0,0 +1,3 @@
+{
+    "name": "ns-efr32-rf"
+}