diff --git a/pkg/nimble/Makefile b/pkg/nimble/Makefile
index 3b414c5a04..f016dfddba 100644
--- a/pkg/nimble/Makefile
+++ b/pkg/nimble/Makefile
@@ -35,43 +35,43 @@ nimble_riot_contrib:
 	"$(MAKE)" -C $(TDIR)/contrib/
 
 nimble_porting_nimble:
-	"$(MAKE)" -C $(PDIR)/porting/nimble/src/ -f $(TDIR)/porting.nimble.mk
+	"$(MAKE)" -C $(PDIR)/porting/nimble/src/ -f $(RIOTBASE)/Makefile.base MODULE=$@
 
 nimble_npl_riot:
-	"$(MAKE)" -C $(PDIR)/porting/npl/riot/src/ -f $(TDIR)/porting.npl.riot.mk
+	"$(MAKE)" -C $(PDIR)/porting/npl/riot/src/ -f $(RIOTBASE)/Makefile.base MODULE=$@
 
 # host modules
 nimble_host:
 	"$(MAKE)" -C $(PDIR)/nimble/host/src/ -f $(TDIR)/nimble.host.mk
 
 nimble_host_util:
-	"$(MAKE)" -C $(PDIR)/nimble/host/util/src/ -f $(TDIR)/nimble.host.util.mk
+	"$(MAKE)" -C $(PDIR)/nimble/host/util/src/ -f $(RIOTBASE)/Makefile.base MODULE=$@
 
 nimble_host_store_ram:
-	"$(MAKE)" -C $(PDIR)/nimble/host/store/ram/src/ -f $(TDIR)/nimble.host.store.ram.mk
+	"$(MAKE)" -C $(PDIR)/nimble/host/store/ram/src/ -f $(RIOTBASE)/Makefile.base MODULE=$@
 
 nimble_tinycrypt:
-	"$(MAKE)" -C $(PDIR)/ext/tinycrypt/src/ -f $(TDIR)/ext.tinycrypt.mk
+	"$(MAKE)" -C $(PDIR)/ext/tinycrypt/src/ -f $(RIOTBASE)/Makefile.base MODULE=$@
 
 # service implementations
 nimble_svc_gap:
-	"$(MAKE)" -C $(PDIR)/nimble/host/services/gap/src/ -f $(TDIR)/svc.gap.mk
+	"$(MAKE)" -C $(PDIR)/nimble/host/services/gap/src/ -f $(RIOTBASE)/Makefile.base MODULE=$@
 
 nimble_svc_gatt:
-	"$(MAKE)" -C $(PDIR)/nimble/host/services/gatt/src/ -f $(TDIR)/svc.gatt.mk
+	"$(MAKE)" -C $(PDIR)/nimble/host/services/gatt/src/ -f $(RIOTBASE)/Makefile.base MODULE=$@
 
 nimble_svc_ipss:
-	"$(MAKE)" -C $(PDIR)/nimble/host/services/ipss/src/ -f $(TDIR)/svc.ipss.mk
+	"$(MAKE)" -C $(PDIR)/nimble/host/services/ipss/src/ -f $(RIOTBASE)/Makefile.base MODULE=$@
 
 # controller specific modules
 nimble_transport_ram:
-	"$(MAKE)" -C $(PDIR)/nimble/transport/ram/src/ -f $(TDIR)/transport.ram.mk
+	"$(MAKE)" -C $(PDIR)/nimble/transport/ram/src/ -f $(RIOTBASE)/Makefile.base MODULE=$@
 
 nimble_controller:
-	"$(MAKE)" -C $(PDIR)/nimble/controller/src/ -f $(TDIR)/controller.mk
+	"$(MAKE)" -C $(PDIR)/nimble/controller/src/ -f $(RIOTBASE)/Makefile.base MODULE=$@
 
 nimble_drivers_nrf5x:
-	"$(MAKE)" -C $(PDIR)/nimble/drivers/$(CPU_FAM)/src/ -f $(TDIR)/drivers.nrf5x.mk
+	"$(MAKE)" -C $(PDIR)/nimble/drivers/$(CPU_FAM)/src/ -f $(RIOTBASE)/Makefile.base MODULE=$@
 
 # additional, RIOT specific nimble modules
 nimble_addr:
diff --git a/pkg/nimble/controller.mk b/pkg/nimble/controller.mk
deleted file mode 100644
index 6fce00f2e1..0000000000
--- a/pkg/nimble/controller.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE = nimble_controller
-
-include $(RIOTBASE)/Makefile.base
diff --git a/pkg/nimble/drivers.nrf5x.mk b/pkg/nimble/drivers.nrf5x.mk
deleted file mode 100644
index 206407ee98..0000000000
--- a/pkg/nimble/drivers.nrf5x.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE = nimble_drivers_nrf5x
-
-include $(RIOTBASE)/Makefile.base
diff --git a/pkg/nimble/ext.tinycrypt.mk b/pkg/nimble/ext.tinycrypt.mk
deleted file mode 100644
index 8ce5eba083..0000000000
--- a/pkg/nimble/ext.tinycrypt.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE = nimble_tinycrypt
-
-include $(RIOTBASE)/Makefile.base
diff --git a/pkg/nimble/nimble.host.store.ram.mk b/pkg/nimble/nimble.host.store.ram.mk
deleted file mode 100644
index a3b03cf2b5..0000000000
--- a/pkg/nimble/nimble.host.store.ram.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE = nimble_host_store_ram
-
-include $(RIOTBASE)/Makefile.base
diff --git a/pkg/nimble/nimble.host.util.mk b/pkg/nimble/nimble.host.util.mk
deleted file mode 100644
index 473a004a2e..0000000000
--- a/pkg/nimble/nimble.host.util.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE = nimble_host_util
-
-include $(RIOTBASE)/Makefile.base
diff --git a/pkg/nimble/porting.nimble.mk b/pkg/nimble/porting.nimble.mk
deleted file mode 100644
index 806ba1b397..0000000000
--- a/pkg/nimble/porting.nimble.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE = nimble_porting_nimble
-
-include $(RIOTBASE)/Makefile.base
diff --git a/pkg/nimble/porting.npl.riot.mk b/pkg/nimble/porting.npl.riot.mk
deleted file mode 100644
index 20b06cddda..0000000000
--- a/pkg/nimble/porting.npl.riot.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE = nimble_npl_riot
-
-include $(RIOTBASE)/Makefile.base
diff --git a/pkg/nimble/svc.gap.mk b/pkg/nimble/svc.gap.mk
deleted file mode 100644
index 33f08d71d5..0000000000
--- a/pkg/nimble/svc.gap.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE = nimble_svc_gap
-
-include $(RIOTBASE)/Makefile.base
diff --git a/pkg/nimble/svc.gatt.mk b/pkg/nimble/svc.gatt.mk
deleted file mode 100644
index b7feb06504..0000000000
--- a/pkg/nimble/svc.gatt.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE = nimble_svc_gatt
-
-include $(RIOTBASE)/Makefile.base
diff --git a/pkg/nimble/svc.ipss.mk b/pkg/nimble/svc.ipss.mk
deleted file mode 100644
index edfef9b986..0000000000
--- a/pkg/nimble/svc.ipss.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE = nimble_svc_ipss
-
-include $(RIOTBASE)/Makefile.base
diff --git a/pkg/nimble/transport.ram.mk b/pkg/nimble/transport.ram.mk
deleted file mode 100644
index 47774e1f9f..0000000000
--- a/pkg/nimble/transport.ram.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE += nimble_transport_ram
-
-include $(RIOTBASE)/Makefile.base