diff --git a/src/drivers/boards/aerocore2/CMakeLists.txt b/src/drivers/boards/aerocore2/CMakeLists.txt
index 6e48c387b0..264812f312 100644
--- a/src/drivers/boards/aerocore2/CMakeLists.txt
+++ b/src/drivers/boards/aerocore2/CMakeLists.txt
@@ -30,15 +30,12 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-px4_add_module(
-	MODULE drivers__boards__aerocore2
-	SRCS
-		aerocore2_can.c
-		aerocore2_init.c
-		aerocore2_timer_config.c
-		aerocore2_spi.c
-		aerocore2_usb.c
-		aerocore2_led.c
-	DEPENDS
-		platforms__common
-	)
\ No newline at end of file
+
+px4_add_library(drivers_board
+	can.c
+	init.c
+	led.c
+	spi.c
+	timer_config.c
+	usb.c
+)
diff --git a/src/drivers/boards/aerocore2/aerocore2_can.c b/src/drivers/boards/aerocore2/can.c
similarity index 100%
rename from src/drivers/boards/aerocore2/aerocore2_can.c
rename to src/drivers/boards/aerocore2/can.c
diff --git a/src/drivers/boards/aerocore2/aerocore2_init.c b/src/drivers/boards/aerocore2/init.c
similarity index 100%
rename from src/drivers/boards/aerocore2/aerocore2_init.c
rename to src/drivers/boards/aerocore2/init.c
diff --git a/src/drivers/boards/aerocore2/aerocore2_led.c b/src/drivers/boards/aerocore2/led.c
similarity index 100%
rename from src/drivers/boards/aerocore2/aerocore2_led.c
rename to src/drivers/boards/aerocore2/led.c
diff --git a/src/drivers/boards/aerocore2/aerocore2_spi.c b/src/drivers/boards/aerocore2/spi.c
similarity index 100%
rename from src/drivers/boards/aerocore2/aerocore2_spi.c
rename to src/drivers/boards/aerocore2/spi.c
diff --git a/src/drivers/boards/aerocore2/aerocore2_timer_config.c b/src/drivers/boards/aerocore2/timer_config.c
similarity index 100%
rename from src/drivers/boards/aerocore2/aerocore2_timer_config.c
rename to src/drivers/boards/aerocore2/timer_config.c
diff --git a/src/drivers/boards/aerocore2/aerocore2_usb.c b/src/drivers/boards/aerocore2/usb.c
similarity index 100%
rename from src/drivers/boards/aerocore2/aerocore2_usb.c
rename to src/drivers/boards/aerocore2/usb.c
diff --git a/src/drivers/boards/aerofc-v1/CMakeLists.txt b/src/drivers/boards/aerofc-v1/CMakeLists.txt
index e592f12675..63c61dc049 100644
--- a/src/drivers/boards/aerofc-v1/CMakeLists.txt
+++ b/src/drivers/boards/aerofc-v1/CMakeLists.txt
@@ -31,13 +31,10 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-px4_add_module(
-	MODULE drivers__boards__aerofc-v1
-	SRCS
-		aerofc_init.c
-		aerofc_spi.c
-		aerofc_led.c
-		aerofc_timer_config.c
-	DEPENDS
-		platforms__common
-	)
\ No newline at end of file
+
+px4_add_library(drivers_board
+	init.c
+	led.c
+	spi.c
+	timer_config.c
+)
diff --git a/src/drivers/boards/aerofc-v1/aerofc_init.c b/src/drivers/boards/aerofc-v1/init.c
similarity index 100%
rename from src/drivers/boards/aerofc-v1/aerofc_init.c
rename to src/drivers/boards/aerofc-v1/init.c
diff --git a/src/drivers/boards/aerofc-v1/aerofc_led.c b/src/drivers/boards/aerofc-v1/led.c
similarity index 100%
rename from src/drivers/boards/aerofc-v1/aerofc_led.c
rename to src/drivers/boards/aerofc-v1/led.c
diff --git a/src/drivers/boards/aerofc-v1/aerofc_spi.c b/src/drivers/boards/aerofc-v1/spi.c
similarity index 100%
rename from src/drivers/boards/aerofc-v1/aerofc_spi.c
rename to src/drivers/boards/aerofc-v1/spi.c
diff --git a/src/drivers/boards/aerofc-v1/aerofc_timer_config.c b/src/drivers/boards/aerofc-v1/timer_config.c
similarity index 100%
rename from src/drivers/boards/aerofc-v1/aerofc_timer_config.c
rename to src/drivers/boards/aerofc-v1/timer_config.c
diff --git a/src/drivers/boards/auav-x21/CMakeLists.txt b/src/drivers/boards/auav-x21/CMakeLists.txt
index 420c0d53bf..264812f312 100644
--- a/src/drivers/boards/auav-x21/CMakeLists.txt
+++ b/src/drivers/boards/auav-x21/CMakeLists.txt
@@ -30,15 +30,12 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-px4_add_module(
-	MODULE drivers__boards__auav-x21
-	SRCS
-		auav_can.c
-		auav_init.c
-		auav_timer_config.c
-		auav_spi.c
-		auav_usb.c
-		auav_led.c
-	DEPENDS
-		platforms__common
-	)
\ No newline at end of file
+
+px4_add_library(drivers_board
+	can.c
+	init.c
+	led.c
+	spi.c
+	timer_config.c
+	usb.c
+)
diff --git a/src/drivers/boards/auav-x21/auav_can.c b/src/drivers/boards/auav-x21/can.c
similarity index 100%
rename from src/drivers/boards/auav-x21/auav_can.c
rename to src/drivers/boards/auav-x21/can.c
diff --git a/src/drivers/boards/auav-x21/auav_init.c b/src/drivers/boards/auav-x21/init.c
similarity index 100%
rename from src/drivers/boards/auav-x21/auav_init.c
rename to src/drivers/boards/auav-x21/init.c
diff --git a/src/drivers/boards/auav-x21/auav_led.c b/src/drivers/boards/auav-x21/led.c
similarity index 100%
rename from src/drivers/boards/auav-x21/auav_led.c
rename to src/drivers/boards/auav-x21/led.c
diff --git a/src/drivers/boards/auav-x21/auav_spi.c b/src/drivers/boards/auav-x21/spi.c
similarity index 100%
rename from src/drivers/boards/auav-x21/auav_spi.c
rename to src/drivers/boards/auav-x21/spi.c
diff --git a/src/drivers/boards/auav-x21/auav_timer_config.c b/src/drivers/boards/auav-x21/timer_config.c
similarity index 100%
rename from src/drivers/boards/auav-x21/auav_timer_config.c
rename to src/drivers/boards/auav-x21/timer_config.c
diff --git a/src/drivers/boards/auav-x21/auav_usb.c b/src/drivers/boards/auav-x21/usb.c
similarity index 100%
rename from src/drivers/boards/auav-x21/auav_usb.c
rename to src/drivers/boards/auav-x21/usb.c
diff --git a/src/drivers/boards/crazyflie/CMakeLists.txt b/src/drivers/boards/crazyflie/CMakeLists.txt
index 95ac9c4eac..27101c7b71 100644
--- a/src/drivers/boards/crazyflie/CMakeLists.txt
+++ b/src/drivers/boards/crazyflie/CMakeLists.txt
@@ -30,13 +30,10 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-px4_add_module(
-	MODULE drivers__boards__crazyflie
-	SRCS
-		crazyflie_init.c
-		crazyflie_usb.c
-		crazyflie_led.c
-		crazyflie_timer_config.c
-	DEPENDS
-		platforms__common
-	)
\ No newline at end of file
+
+px4_add_library(drivers_board
+	init.c
+	led.c
+	timer_config.c
+	usb.c
+)
diff --git a/src/drivers/boards/crazyflie/crazyflie_init.c b/src/drivers/boards/crazyflie/init.c
similarity index 100%
rename from src/drivers/boards/crazyflie/crazyflie_init.c
rename to src/drivers/boards/crazyflie/init.c
diff --git a/src/drivers/boards/crazyflie/crazyflie_led.c b/src/drivers/boards/crazyflie/led.c
similarity index 100%
rename from src/drivers/boards/crazyflie/crazyflie_led.c
rename to src/drivers/boards/crazyflie/led.c
diff --git a/src/drivers/boards/crazyflie/crazyflie_timer_config.c b/src/drivers/boards/crazyflie/timer_config.c
similarity index 100%
rename from src/drivers/boards/crazyflie/crazyflie_timer_config.c
rename to src/drivers/boards/crazyflie/timer_config.c
diff --git a/src/drivers/boards/crazyflie/crazyflie_usb.c b/src/drivers/boards/crazyflie/usb.c
similarity index 100%
rename from src/drivers/boards/crazyflie/crazyflie_usb.c
rename to src/drivers/boards/crazyflie/usb.c
diff --git a/src/drivers/boards/esc35-v1/CMakeLists.txt b/src/drivers/boards/esc35-v1/CMakeLists.txt
index 146a058e2b..7b97686e5d 100644
--- a/src/drivers/boards/esc35-v1/CMakeLists.txt
+++ b/src/drivers/boards/esc35-v1/CMakeLists.txt
@@ -31,23 +31,12 @@
 #
 ############################################################################
 
-message(WARNING-"Configuraton is incomplete")
-message(WARNING-"Configuraton is incomplete")
-message(WARNING-"Configuraton is incomplete")
-message(WARNING-"Configuraton is incomplete")
-message(WARNING-"Configuraton is incomplete")
-message(WARNING-"DO NOT RUN THIS ON HW")
-message(WARNING-"IT IS NOT PINED OUT TO HW")
-message(WARNING-"Configuraton is incomplete")
-message(WARNING-"Configuraton is incomplete")
-message(WARNING-"Configuraton is incomplete")
+message(WARNING "Configuraton is incomplete")
+message(WARNING "DO NOT RUN THIS ON HW")
+message(WARNING "IT IS NOT PINED OUT TO HW")
 
-px4_add_module(
-	MODULE drivers__boards__esc35-v1
-	SRCS
-		esc35_init.c
-		esc35_led.c
-		esc35_usb.c
-	DEPENDS
-		platforms__common
-	)
\ No newline at end of file
+px4_add_library(drivers_board
+	init.c
+	led.c
+	usb.c
+)
diff --git a/src/drivers/boards/esc35-v1/esc35_init.c b/src/drivers/boards/esc35-v1/init.c
similarity index 100%
rename from src/drivers/boards/esc35-v1/esc35_init.c
rename to src/drivers/boards/esc35-v1/init.c
diff --git a/src/drivers/boards/esc35-v1/esc35_led.c b/src/drivers/boards/esc35-v1/led.c
similarity index 100%
rename from src/drivers/boards/esc35-v1/esc35_led.c
rename to src/drivers/boards/esc35-v1/led.c
diff --git a/src/drivers/boards/esc35-v1/esc35_usb.c b/src/drivers/boards/esc35-v1/usb.c
similarity index 100%
rename from src/drivers/boards/esc35-v1/esc35_usb.c
rename to src/drivers/boards/esc35-v1/usb.c
diff --git a/src/drivers/boards/mindpx-v2/CMakeLists.txt b/src/drivers/boards/mindpx-v2/CMakeLists.txt
index 87cc9209f1..264812f312 100644
--- a/src/drivers/boards/mindpx-v2/CMakeLists.txt
+++ b/src/drivers/boards/mindpx-v2/CMakeLists.txt
@@ -30,15 +30,12 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-px4_add_module(
-	MODULE drivers__boards__mindpx-v2
-	SRCS
-		mindpx_can.c
-		mindpx2_init.c
-		mindpx_timer_config.c
-		mindpx_spi.c
-		mindpx_usb.c
-		mindpx2_led.c
-	DEPENDS
-		platforms__common
-	)
\ No newline at end of file
+
+px4_add_library(drivers_board
+	can.c
+	init.c
+	led.c
+	spi.c
+	timer_config.c
+	usb.c
+)
diff --git a/src/drivers/boards/mindpx-v2/mindpx_can.c b/src/drivers/boards/mindpx-v2/can.c
similarity index 100%
rename from src/drivers/boards/mindpx-v2/mindpx_can.c
rename to src/drivers/boards/mindpx-v2/can.c
diff --git a/src/drivers/boards/mindpx-v2/mindpx2_init.c b/src/drivers/boards/mindpx-v2/init.c
similarity index 100%
rename from src/drivers/boards/mindpx-v2/mindpx2_init.c
rename to src/drivers/boards/mindpx-v2/init.c
diff --git a/src/drivers/boards/mindpx-v2/mindpx2_led.c b/src/drivers/boards/mindpx-v2/led.c
similarity index 100%
rename from src/drivers/boards/mindpx-v2/mindpx2_led.c
rename to src/drivers/boards/mindpx-v2/led.c
diff --git a/src/drivers/boards/mindpx-v2/mindpx_spi.c b/src/drivers/boards/mindpx-v2/spi.c
similarity index 100%
rename from src/drivers/boards/mindpx-v2/mindpx_spi.c
rename to src/drivers/boards/mindpx-v2/spi.c
diff --git a/src/drivers/boards/mindpx-v2/mindpx_timer_config.c b/src/drivers/boards/mindpx-v2/timer_config.c
similarity index 100%
rename from src/drivers/boards/mindpx-v2/mindpx_timer_config.c
rename to src/drivers/boards/mindpx-v2/timer_config.c
diff --git a/src/drivers/boards/mindpx-v2/mindpx_usb.c b/src/drivers/boards/mindpx-v2/usb.c
similarity index 100%
rename from src/drivers/boards/mindpx-v2/mindpx_usb.c
rename to src/drivers/boards/mindpx-v2/usb.c
diff --git a/src/drivers/boards/nxphlite-v3/CMakeLists.txt b/src/drivers/boards/nxphlite-v3/CMakeLists.txt
index 4028a03c5f..e32742c0f2 100644
--- a/src/drivers/boards/nxphlite-v3/CMakeLists.txt
+++ b/src/drivers/boards/nxphlite-v3/CMakeLists.txt
@@ -30,18 +30,15 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-px4_add_module(
-	MODULE drivers__boards__nxphlite-v3
-	SRCS
-		nxphlite_autoleds.c
-		nxphlite_automount.c
-		nxphlite_can.c
-		nxphlite_init.c
-		nxphlite_led.c
-		nxphlite_sdhc.c
-		nxphlite_spi.c
-		nxphlite_timer_config.c
-		nxphlite_usb.c
-	DEPENDS
-		platforms__common
-	)
\ No newline at end of file
+
+px4_add_library(drivers_board
+	autoleds.c
+	automount.c
+	can.c
+	init.c
+	led.c
+	sdhc.c
+	spi.c
+	timer_config.c
+	usb.c
+)
diff --git a/src/drivers/boards/nxphlite-v3/nxphlite_autoleds.c b/src/drivers/boards/nxphlite-v3/autoleds.c
similarity index 100%
rename from src/drivers/boards/nxphlite-v3/nxphlite_autoleds.c
rename to src/drivers/boards/nxphlite-v3/autoleds.c
diff --git a/src/drivers/boards/nxphlite-v3/nxphlite_automount.c b/src/drivers/boards/nxphlite-v3/automount.c
similarity index 100%
rename from src/drivers/boards/nxphlite-v3/nxphlite_automount.c
rename to src/drivers/boards/nxphlite-v3/automount.c
diff --git a/src/drivers/boards/nxphlite-v3/nxphlite_can.c b/src/drivers/boards/nxphlite-v3/can.c
similarity index 100%
rename from src/drivers/boards/nxphlite-v3/nxphlite_can.c
rename to src/drivers/boards/nxphlite-v3/can.c
diff --git a/src/drivers/boards/nxphlite-v3/nxphlite_init.c b/src/drivers/boards/nxphlite-v3/init.c
similarity index 100%
rename from src/drivers/boards/nxphlite-v3/nxphlite_init.c
rename to src/drivers/boards/nxphlite-v3/init.c
diff --git a/src/drivers/boards/nxphlite-v3/nxphlite_led.c b/src/drivers/boards/nxphlite-v3/led.c
similarity index 100%
rename from src/drivers/boards/nxphlite-v3/nxphlite_led.c
rename to src/drivers/boards/nxphlite-v3/led.c
diff --git a/src/drivers/boards/nxphlite-v3/nxphlite_sdhc.c b/src/drivers/boards/nxphlite-v3/sdhc.c
similarity index 100%
rename from src/drivers/boards/nxphlite-v3/nxphlite_sdhc.c
rename to src/drivers/boards/nxphlite-v3/sdhc.c
diff --git a/src/drivers/boards/nxphlite-v3/nxphlite_spi.c b/src/drivers/boards/nxphlite-v3/spi.c
similarity index 100%
rename from src/drivers/boards/nxphlite-v3/nxphlite_spi.c
rename to src/drivers/boards/nxphlite-v3/spi.c
diff --git a/src/drivers/boards/nxphlite-v3/nxphlite_timer_config.c b/src/drivers/boards/nxphlite-v3/timer_config.c
similarity index 100%
rename from src/drivers/boards/nxphlite-v3/nxphlite_timer_config.c
rename to src/drivers/boards/nxphlite-v3/timer_config.c
diff --git a/src/drivers/boards/nxphlite-v3/nxphlite_usb.c b/src/drivers/boards/nxphlite-v3/usb.c
similarity index 100%
rename from src/drivers/boards/nxphlite-v3/nxphlite_usb.c
rename to src/drivers/boards/nxphlite-v3/usb.c
diff --git a/src/drivers/boards/px4-same70xplained-v1/CMakeLists.txt b/src/drivers/boards/px4-same70xplained-v1/CMakeLists.txt
index b0b3492857..17c350195f 100644
--- a/src/drivers/boards/px4-same70xplained-v1/CMakeLists.txt
+++ b/src/drivers/boards/px4-same70xplained-v1/CMakeLists.txt
@@ -30,16 +30,13 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-px4_add_module(
-	MODULE drivers__boards__px4-same70xplained-v1
-	SRCS
-		px4same70xplained_can.c
-		px4same70xplained_init.c
-		px4same70xplained_timer_config.c
-		px4same70xplained_spi.c
-		px4same70xplained_usb.c
-		px4same70xplained_led.c
-		px4same70xplained_sdram.c
-	DEPENDS
-		platforms__common
-	)
+
+px4_add_library(drivers_board
+	can.c
+	init.c
+	led.c
+	sdram.c
+	spi.c
+	timer_config.c
+	usb.c
+)
diff --git a/src/drivers/boards/px4-same70xplained-v1/px4same70xplained_can.c b/src/drivers/boards/px4-same70xplained-v1/can.c
similarity index 100%
rename from src/drivers/boards/px4-same70xplained-v1/px4same70xplained_can.c
rename to src/drivers/boards/px4-same70xplained-v1/can.c
diff --git a/src/drivers/boards/px4-same70xplained-v1/px4same70xplained_init.c b/src/drivers/boards/px4-same70xplained-v1/init.c
similarity index 100%
rename from src/drivers/boards/px4-same70xplained-v1/px4same70xplained_init.c
rename to src/drivers/boards/px4-same70xplained-v1/init.c
diff --git a/src/drivers/boards/px4-same70xplained-v1/px4same70xplained_led.c b/src/drivers/boards/px4-same70xplained-v1/led.c
similarity index 100%
rename from src/drivers/boards/px4-same70xplained-v1/px4same70xplained_led.c
rename to src/drivers/boards/px4-same70xplained-v1/led.c
diff --git a/src/drivers/boards/px4-same70xplained-v1/px4same70xplained_sdram.c b/src/drivers/boards/px4-same70xplained-v1/sdram.c
similarity index 100%
rename from src/drivers/boards/px4-same70xplained-v1/px4same70xplained_sdram.c
rename to src/drivers/boards/px4-same70xplained-v1/sdram.c
diff --git a/src/drivers/boards/px4-same70xplained-v1/px4same70xplained_spi.c b/src/drivers/boards/px4-same70xplained-v1/spi.c
similarity index 100%
rename from src/drivers/boards/px4-same70xplained-v1/px4same70xplained_spi.c
rename to src/drivers/boards/px4-same70xplained-v1/spi.c
diff --git a/src/drivers/boards/px4-same70xplained-v1/px4same70xplained_timer_config.c b/src/drivers/boards/px4-same70xplained-v1/timer_config.c
similarity index 100%
rename from src/drivers/boards/px4-same70xplained-v1/px4same70xplained_timer_config.c
rename to src/drivers/boards/px4-same70xplained-v1/timer_config.c
diff --git a/src/drivers/boards/px4-same70xplained-v1/px4same70xplained_usb.c b/src/drivers/boards/px4-same70xplained-v1/usb.c
similarity index 100%
rename from src/drivers/boards/px4-same70xplained-v1/px4same70xplained_usb.c
rename to src/drivers/boards/px4-same70xplained-v1/usb.c
diff --git a/src/drivers/boards/px4-stm32f4discovery/CMakeLists.txt b/src/drivers/boards/px4-stm32f4discovery/CMakeLists.txt
index f885c489e6..84d50d9774 100644
--- a/src/drivers/boards/px4-stm32f4discovery/CMakeLists.txt
+++ b/src/drivers/boards/px4-stm32f4discovery/CMakeLists.txt
@@ -30,12 +30,9 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-px4_add_module(
-	MODULE drivers__boards__px4-stm32f4discovery
-	SRCS
-		px4discovery_init.c
-		px4discovery_usb.c
-		px4discovery_led.c
-	DEPENDS
-		platforms__common
-	)
\ No newline at end of file
+
+px4_add_library(drivers_board
+	init.c
+	led.c
+	usb.c
+)
diff --git a/src/drivers/boards/px4-stm32f4discovery/px4discovery_init.c b/src/drivers/boards/px4-stm32f4discovery/init.c
similarity index 100%
rename from src/drivers/boards/px4-stm32f4discovery/px4discovery_init.c
rename to src/drivers/boards/px4-stm32f4discovery/init.c
diff --git a/src/drivers/boards/px4-stm32f4discovery/px4discovery_led.c b/src/drivers/boards/px4-stm32f4discovery/led.c
similarity index 100%
rename from src/drivers/boards/px4-stm32f4discovery/px4discovery_led.c
rename to src/drivers/boards/px4-stm32f4discovery/led.c
diff --git a/src/drivers/boards/px4-stm32f4discovery/px4discovery_usb.c b/src/drivers/boards/px4-stm32f4discovery/usb.c
similarity index 100%
rename from src/drivers/boards/px4-stm32f4discovery/px4discovery_usb.c
rename to src/drivers/boards/px4-stm32f4discovery/usb.c
diff --git a/src/drivers/boards/px4cannode-v1/CMakeLists.txt b/src/drivers/boards/px4cannode-v1/CMakeLists.txt
index fa797fe19c..5b685108b7 100644
--- a/src/drivers/boards/px4cannode-v1/CMakeLists.txt
+++ b/src/drivers/boards/px4cannode-v1/CMakeLists.txt
@@ -31,14 +31,10 @@
 #
 ############################################################################
 
-px4_add_module(
-	MODULE drivers__boards__px4cannode-v1
-	SRCS
-		px4cannode_can.c
-		px4cannode_buttons.c
-		px4cannode_init.c
-		px4cannode_led.c
-		px4cannode_spi.c
-	DEPENDS
-		platforms__common
-	)
\ No newline at end of file
+px4_add_library(drivers_board
+	buttons.c
+	can.c
+	init.c
+	led.c
+	spi.c
+)
diff --git a/src/drivers/boards/px4cannode-v1/px4cannode_buttons.c b/src/drivers/boards/px4cannode-v1/buttons.c
similarity index 100%
rename from src/drivers/boards/px4cannode-v1/px4cannode_buttons.c
rename to src/drivers/boards/px4cannode-v1/buttons.c
diff --git a/src/drivers/boards/px4cannode-v1/px4cannode_can.c b/src/drivers/boards/px4cannode-v1/can.c
similarity index 100%
rename from src/drivers/boards/px4cannode-v1/px4cannode_can.c
rename to src/drivers/boards/px4cannode-v1/can.c
diff --git a/src/drivers/boards/px4cannode-v1/px4cannode_init.c b/src/drivers/boards/px4cannode-v1/init.c
similarity index 100%
rename from src/drivers/boards/px4cannode-v1/px4cannode_init.c
rename to src/drivers/boards/px4cannode-v1/init.c
diff --git a/src/drivers/boards/px4cannode-v1/px4cannode_led.c b/src/drivers/boards/px4cannode-v1/led.c
similarity index 100%
rename from src/drivers/boards/px4cannode-v1/px4cannode_led.c
rename to src/drivers/boards/px4cannode-v1/led.c
diff --git a/src/drivers/boards/px4cannode-v1/px4cannode_spi.c b/src/drivers/boards/px4cannode-v1/spi.c
similarity index 100%
rename from src/drivers/boards/px4cannode-v1/px4cannode_spi.c
rename to src/drivers/boards/px4cannode-v1/spi.c
diff --git a/src/drivers/boards/px4esc-v1/CMakeLists.txt b/src/drivers/boards/px4esc-v1/CMakeLists.txt
index 19644fbda1..84d50d9774 100644
--- a/src/drivers/boards/px4esc-v1/CMakeLists.txt
+++ b/src/drivers/boards/px4esc-v1/CMakeLists.txt
@@ -31,12 +31,8 @@
 #
 ############################################################################
 
-px4_add_module(
-	MODULE drivers__boards__px4esc-v1
-	SRCS
-		px4esc_init.c
-		px4esc_led.c
-		px4esc_usb.c
-	DEPENDS
-		platforms__common
-	)
\ No newline at end of file
+px4_add_library(drivers_board
+	init.c
+	led.c
+	usb.c
+)
diff --git a/src/drivers/boards/px4esc-v1/px4esc_init.c b/src/drivers/boards/px4esc-v1/init.c
similarity index 100%
rename from src/drivers/boards/px4esc-v1/px4esc_init.c
rename to src/drivers/boards/px4esc-v1/init.c
diff --git a/src/drivers/boards/px4esc-v1/px4esc_led.c b/src/drivers/boards/px4esc-v1/led.c
similarity index 100%
rename from src/drivers/boards/px4esc-v1/px4esc_led.c
rename to src/drivers/boards/px4esc-v1/led.c
diff --git a/src/drivers/boards/px4esc-v1/px4esc_usb.c b/src/drivers/boards/px4esc-v1/usb.c
similarity index 100%
rename from src/drivers/boards/px4esc-v1/px4esc_usb.c
rename to src/drivers/boards/px4esc-v1/usb.c
diff --git a/src/drivers/boards/px4flow-v2/CMakeLists.txt b/src/drivers/boards/px4flow-v2/CMakeLists.txt
index 1a119b4e92..bb7b1066a3 100644
--- a/src/drivers/boards/px4flow-v2/CMakeLists.txt
+++ b/src/drivers/boards/px4flow-v2/CMakeLists.txt
@@ -31,14 +31,8 @@
 #
 ############################################################################
 
-message(FATAL_ERROR Configuraton is incomplete")
-
-px4_add_module(
-	MODULE drivers__boards__px4flow-v2
-	SRCS
-		px4flow_init.c
-		px4flow_led.c
-		px4flow_can.c
-	DEPENDS
-		platforms__common
-	)
\ No newline at end of file
+px4_add_library(drivers_board
+	can.c
+	init.c
+	led.c
+)
diff --git a/src/drivers/boards/px4flow-v2/px4flow_can.c b/src/drivers/boards/px4flow-v2/can.c
similarity index 100%
rename from src/drivers/boards/px4flow-v2/px4flow_can.c
rename to src/drivers/boards/px4flow-v2/can.c
diff --git a/src/drivers/boards/px4flow-v2/px4flow_init.c b/src/drivers/boards/px4flow-v2/init.c
similarity index 100%
rename from src/drivers/boards/px4flow-v2/px4flow_init.c
rename to src/drivers/boards/px4flow-v2/init.c
diff --git a/src/drivers/boards/px4flow-v2/px4flow_led.c b/src/drivers/boards/px4flow-v2/led.c
similarity index 100%
rename from src/drivers/boards/px4flow-v2/px4flow_led.c
rename to src/drivers/boards/px4flow-v2/led.c
diff --git a/src/drivers/boards/px4fmu-v2/CMakeLists.txt b/src/drivers/boards/px4fmu-v2/CMakeLists.txt
index d8427800c6..9bc94939cd 100644
--- a/src/drivers/boards/px4fmu-v2/CMakeLists.txt
+++ b/src/drivers/boards/px4fmu-v2/CMakeLists.txt
@@ -30,16 +30,13 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-px4_add_module(
-	MODULE drivers__boards__px4fmu-v2
-	SRCS
-		px4fmu_can.c
-		px4fmu_i2c.c
-		px4fmu_init.c
-		px4fmu_led.c
-		px4fmu_spi.c
-		px4fmu_timer_config.c
-		px4fmu_usb.c
-	DEPENDS
-		platforms__common
-	)
+
+px4_add_library(drivers_board
+	can.c
+	i2c.c
+	init.c
+	led.c
+	spi.c
+	timer_config.c
+	usb.c
+)
diff --git a/src/drivers/boards/px4fmu-v2/px4fmu_can.c b/src/drivers/boards/px4fmu-v2/can.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v2/px4fmu_can.c
rename to src/drivers/boards/px4fmu-v2/can.c
diff --git a/src/drivers/boards/px4fmu-v2/px4fmu_i2c.c b/src/drivers/boards/px4fmu-v2/i2c.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v2/px4fmu_i2c.c
rename to src/drivers/boards/px4fmu-v2/i2c.c
diff --git a/src/drivers/boards/px4fmu-v2/px4fmu_init.c b/src/drivers/boards/px4fmu-v2/init.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v2/px4fmu_init.c
rename to src/drivers/boards/px4fmu-v2/init.c
diff --git a/src/drivers/boards/px4fmu-v2/px4fmu_led.c b/src/drivers/boards/px4fmu-v2/led.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v2/px4fmu_led.c
rename to src/drivers/boards/px4fmu-v2/led.c
diff --git a/src/drivers/boards/px4fmu-v2/px4fmu_timer_config.c b/src/drivers/boards/px4fmu-v2/px4fmu_timer_config.c
deleted file mode 100644
index 5adc4260db..0000000000
--- a/src/drivers/boards/px4fmu-v2/px4fmu_timer_config.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/****************************************************************************
- *
- *   Copyright (C) 2012 PX4 Development Team. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name PX4 nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/*
- * @file px4fmu_timer_config.c
- *
- * Configuration data for the stm32 pwm_servo, input capture and pwm input driver.
- *
- * Note that these arrays must always be fully-sized.
- */
-
-#include <stdint.h>
-
-#include <stm32.h>
-#include <stm32_gpio.h>
-#include <stm32_tim.h>
-
-#include <drivers/drv_pwm_output.h>
-#include <drivers/stm32/drv_io_timer.h>
-
-#include "board_config.h"
-
-__EXPORT const io_timers_t io_timers[MAX_IO_TIMERS] = {
-	{
-		.base = STM32_TIM1_BASE,
-		.clock_register = STM32_RCC_APB2ENR,
-		.clock_bit = RCC_APB2ENR_TIM1EN,
-		.clock_freq = STM32_APB2_TIM1_CLKIN,
-		.first_channel_index = 0,
-		.last_channel_index = 3,
-		.handler = io_timer_handler0,
-		.vectorno =  STM32_IRQ_TIM1CC,
-
-	},
-	{
-		.base = STM32_TIM4_BASE,
-		.clock_register = STM32_RCC_APB1ENR,
-		.clock_bit = RCC_APB1ENR_TIM4EN,
-		.clock_freq = STM32_APB1_TIM4_CLKIN,
-		.first_channel_index = 4,
-		.last_channel_index = 5,
-		.handler = io_timer_handler1,
-		.vectorno =  STM32_IRQ_TIM4
-	}
-};
-
-__EXPORT const timer_io_channels_t timer_io_channels[MAX_TIMER_IO_CHANNELS] = {
-	{
-		.gpio_out = GPIO_TIM1_CH4OUT,
-		.gpio_in  = GPIO_TIM1_CH4IN,
-		.timer_index = 0,
-		.timer_channel = 4,
-		.ccr_offset = STM32_GTIM_CCR4_OFFSET,
-		.masks  = GTIM_SR_CC4IF | GTIM_SR_CC4OF
-	},
-	{
-		.gpio_out = GPIO_TIM1_CH3OUT,
-		.gpio_in = GPIO_TIM1_CH3IN,
-		.timer_index = 0,
-		.timer_channel = 3,
-		.ccr_offset = STM32_GTIM_CCR3_OFFSET,
-		.masks  = GTIM_SR_CC3IF | GTIM_SR_CC3OF
-	},
-	{
-		.gpio_out = GPIO_TIM1_CH2OUT,
-		.gpio_in = GPIO_TIM1_CH2IN,
-		.timer_index = 0,
-		.timer_channel = 2,
-		.ccr_offset = STM32_GTIM_CCR2_OFFSET,
-		.masks  = GTIM_SR_CC2IF | GTIM_SR_CC2OF
-	},
-	{
-		.gpio_out = GPIO_TIM1_CH1OUT,
-		.gpio_in = GPIO_TIM1_CH1IN,
-		.timer_index = 0,
-		.timer_channel = 1,
-		.ccr_offset = STM32_GTIM_CCR1_OFFSET,
-		.masks  = GTIM_SR_CC1IF | GTIM_SR_CC1OF
-	},
-	{
-		.gpio_out = GPIO_TIM4_CH2OUT,
-		.gpio_in = GPIO_TIM4_CH2IN,
-		.timer_index = 1,
-		.timer_channel = 2,
-		.ccr_offset = STM32_GTIM_CCR2_OFFSET,
-		.masks  = GTIM_SR_CC2IF | GTIM_SR_CC2OF
-	},
-	{
-		.gpio_out = GPIO_TIM4_CH3OUT,
-		.gpio_in = GPIO_TIM4_CH3IN,
-		.timer_index = 1,
-		.timer_channel = 3,
-		.ccr_offset = STM32_GTIM_CCR3_OFFSET,
-		.masks  = GTIM_SR_CC3IF | GTIM_SR_CC3OF
-	}
-};
diff --git a/src/drivers/boards/px4fmu-v2/px4fmu_spi.c b/src/drivers/boards/px4fmu-v2/spi.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v2/px4fmu_spi.c
rename to src/drivers/boards/px4fmu-v2/spi.c
diff --git a/src/drivers/boards/px4-same70xplained-v1/px4fmu_timer_config.c b/src/drivers/boards/px4fmu-v2/timer_config.c
similarity index 100%
rename from src/drivers/boards/px4-same70xplained-v1/px4fmu_timer_config.c
rename to src/drivers/boards/px4fmu-v2/timer_config.c
diff --git a/src/drivers/boards/px4fmu-v2/px4fmu_usb.c b/src/drivers/boards/px4fmu-v2/usb.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v2/px4fmu_usb.c
rename to src/drivers/boards/px4fmu-v2/usb.c
diff --git a/src/drivers/boards/px4fmu-v4/CMakeLists.txt b/src/drivers/boards/px4fmu-v4/CMakeLists.txt
index bdfd0f283e..264812f312 100644
--- a/src/drivers/boards/px4fmu-v4/CMakeLists.txt
+++ b/src/drivers/boards/px4fmu-v4/CMakeLists.txt
@@ -30,15 +30,12 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-px4_add_module(
-	MODULE drivers__boards__px4fmu-v4
-	SRCS
-		px4fmu_can.c
-		px4fmu_init.c
-		px4fmu_timer_config.c
-		px4fmu_spi.c
-		px4fmu_usb.c
-		px4fmu_led.c
-	DEPENDS
-		platforms__common
-	)
\ No newline at end of file
+
+px4_add_library(drivers_board
+	can.c
+	init.c
+	led.c
+	spi.c
+	timer_config.c
+	usb.c
+)
diff --git a/src/drivers/boards/px4fmu-v4/px4fmu_can.c b/src/drivers/boards/px4fmu-v4/can.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v4/px4fmu_can.c
rename to src/drivers/boards/px4fmu-v4/can.c
diff --git a/src/drivers/boards/px4fmu-v4/px4fmu_init.c b/src/drivers/boards/px4fmu-v4/init.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v4/px4fmu_init.c
rename to src/drivers/boards/px4fmu-v4/init.c
diff --git a/src/drivers/boards/px4fmu-v4/px4fmu_led.c b/src/drivers/boards/px4fmu-v4/led.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v4/px4fmu_led.c
rename to src/drivers/boards/px4fmu-v4/led.c
diff --git a/src/drivers/boards/px4fmu-v4/px4fmu_spi.c b/src/drivers/boards/px4fmu-v4/spi.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v4/px4fmu_spi.c
rename to src/drivers/boards/px4fmu-v4/spi.c
diff --git a/src/drivers/boards/px4fmu-v4/px4fmu_timer_config.c b/src/drivers/boards/px4fmu-v4/timer_config.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v4/px4fmu_timer_config.c
rename to src/drivers/boards/px4fmu-v4/timer_config.c
diff --git a/src/drivers/boards/px4fmu-v4/px4fmu_usb.c b/src/drivers/boards/px4fmu-v4/usb.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v4/px4fmu_usb.c
rename to src/drivers/boards/px4fmu-v4/usb.c
diff --git a/src/drivers/boards/px4fmu-v4pro/CMakeLists.txt b/src/drivers/boards/px4fmu-v4pro/CMakeLists.txt
index 3eb7364c62..264812f312 100644
--- a/src/drivers/boards/px4fmu-v4pro/CMakeLists.txt
+++ b/src/drivers/boards/px4fmu-v4pro/CMakeLists.txt
@@ -30,15 +30,12 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-px4_add_module(
-	MODULE drivers__boards__px4fmu-v4pro
-	SRCS
-		px4fmu_can.c
-		px4fmu_init.c
-		px4fmu_timer_config.c
-		px4fmu_spi.c
-		px4fmu_usb.c
-		px4fmu_led.c
-	DEPENDS
-		platforms__common
-	)
\ No newline at end of file
+
+px4_add_library(drivers_board
+	can.c
+	init.c
+	led.c
+	spi.c
+	timer_config.c
+	usb.c
+)
diff --git a/src/drivers/boards/px4fmu-v4pro/px4fmu_can.c b/src/drivers/boards/px4fmu-v4pro/can.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v4pro/px4fmu_can.c
rename to src/drivers/boards/px4fmu-v4pro/can.c
diff --git a/src/drivers/boards/px4fmu-v4pro/px4fmu_init.c b/src/drivers/boards/px4fmu-v4pro/init.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v4pro/px4fmu_init.c
rename to src/drivers/boards/px4fmu-v4pro/init.c
diff --git a/src/drivers/boards/px4fmu-v4pro/px4fmu_led.c b/src/drivers/boards/px4fmu-v4pro/led.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v4pro/px4fmu_led.c
rename to src/drivers/boards/px4fmu-v4pro/led.c
diff --git a/src/drivers/boards/px4fmu-v4pro/px4fmu_spi.c b/src/drivers/boards/px4fmu-v4pro/spi.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v4pro/px4fmu_spi.c
rename to src/drivers/boards/px4fmu-v4pro/spi.c
diff --git a/src/drivers/boards/px4fmu-v4pro/px4fmu_timer_config.c b/src/drivers/boards/px4fmu-v4pro/timer_config.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v4pro/px4fmu_timer_config.c
rename to src/drivers/boards/px4fmu-v4pro/timer_config.c
diff --git a/src/drivers/boards/px4fmu-v4pro/px4fmu_usb.c b/src/drivers/boards/px4fmu-v4pro/usb.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v4pro/px4fmu_usb.c
rename to src/drivers/boards/px4fmu-v4pro/usb.c
diff --git a/src/drivers/boards/px4fmu-v5/CMakeLists.txt b/src/drivers/boards/px4fmu-v5/CMakeLists.txt
index a3f31de9cb..e3b8d40f91 100644
--- a/src/drivers/boards/px4fmu-v5/CMakeLists.txt
+++ b/src/drivers/boards/px4fmu-v5/CMakeLists.txt
@@ -30,16 +30,13 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-px4_add_module(
-	MODULE drivers__boards__px4fmu-v5
-	SRCS
-#		WIP px4fmu_can.c
-		px4fmu_init.c
-		px4fmu_sdio.c
-		px4fmu_timer_config.c
-		px4fmu_spi.c
-		px4fmu_usb.c
-		px4fmu_led.c
-	DEPENDS
-		platforms__common
-	)
\ No newline at end of file
+
+px4_add_library(drivers_board
+	#stm32_can.c # WIP
+	init.c
+	led.c
+	sdio.c
+	spi.c
+	timer_config.c
+	usb.c
+)
diff --git a/src/drivers/boards/px4fmu-v5/px4fmu_can.c b/src/drivers/boards/px4fmu-v5/can.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v5/px4fmu_can.c
rename to src/drivers/boards/px4fmu-v5/can.c
diff --git a/src/drivers/boards/px4fmu-v5/px4fmu_init.c b/src/drivers/boards/px4fmu-v5/init.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v5/px4fmu_init.c
rename to src/drivers/boards/px4fmu-v5/init.c
diff --git a/src/drivers/boards/px4fmu-v5/px4fmu_led.c b/src/drivers/boards/px4fmu-v5/led.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v5/px4fmu_led.c
rename to src/drivers/boards/px4fmu-v5/led.c
diff --git a/src/drivers/boards/px4fmu-v5/px4fmu_sdio.c b/src/drivers/boards/px4fmu-v5/sdio.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v5/px4fmu_sdio.c
rename to src/drivers/boards/px4fmu-v5/sdio.c
diff --git a/src/drivers/boards/px4fmu-v5/px4fmu_spi.c b/src/drivers/boards/px4fmu-v5/spi.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v5/px4fmu_spi.c
rename to src/drivers/boards/px4fmu-v5/spi.c
diff --git a/src/drivers/boards/px4fmu-v5/px4fmu_timer_config.c b/src/drivers/boards/px4fmu-v5/timer_config.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v5/px4fmu_timer_config.c
rename to src/drivers/boards/px4fmu-v5/timer_config.c
diff --git a/src/drivers/boards/px4fmu-v5/px4fmu_usb.c b/src/drivers/boards/px4fmu-v5/usb.c
similarity index 100%
rename from src/drivers/boards/px4fmu-v5/px4fmu_usb.c
rename to src/drivers/boards/px4fmu-v5/usb.c
diff --git a/src/drivers/boards/px4io-v2/CMakeLists.txt b/src/drivers/boards/px4io-v2/CMakeLists.txt
index 8a4ddb6aa8..54117f23f4 100644
--- a/src/drivers/boards/px4io-v2/CMakeLists.txt
+++ b/src/drivers/boards/px4io-v2/CMakeLists.txt
@@ -30,11 +30,8 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-px4_add_module(
-	MODULE drivers__boards__px4io-v2
-	SRCS
-		px4io_init.c
-		px4io_timer_config.c
-	DEPENDS
-		platforms__common
-	)
\ No newline at end of file
+
+px4_add_library(drivers_board
+	init.c
+	timer_config.c
+)
diff --git a/src/drivers/boards/px4io-v2/px4io_init.c b/src/drivers/boards/px4io-v2/init.c
similarity index 100%
rename from src/drivers/boards/px4io-v2/px4io_init.c
rename to src/drivers/boards/px4io-v2/init.c
diff --git a/src/drivers/boards/px4io-v2/px4io_timer_config.c b/src/drivers/boards/px4io-v2/timer_config.c
similarity index 100%
rename from src/drivers/boards/px4io-v2/px4io_timer_config.c
rename to src/drivers/boards/px4io-v2/timer_config.c
diff --git a/src/drivers/boards/px4nucleoF767ZI-v1/CMakeLists.txt b/src/drivers/boards/px4nucleoF767ZI-v1/CMakeLists.txt
index bd08cf3942..0d2694d635 100644
--- a/src/drivers/boards/px4nucleoF767ZI-v1/CMakeLists.txt
+++ b/src/drivers/boards/px4nucleoF767ZI-v1/CMakeLists.txt
@@ -30,16 +30,13 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-px4_add_module(
-	MODULE drivers__boards__px4nucleoF767ZI-v1
-	SRCS
-#		WIP px4nucleo_can.c
-		px4nucleo_init.c
-		px4nucleo_sdio.c
-		px4nucleo_timer_config.c
-		px4nucleo_spi.c
-		px4nucleo_usb.c
-		px4nucleo_led.c
-	DEPENDS
-		platforms__common
-	)
\ No newline at end of file
+
+px4_add_library(drivers_board
+	# stm32_can.c # WIP
+	init.c
+	led.c
+	sdio.c
+	spi.c
+	timer_config.c
+	usb.c
+)
diff --git a/src/drivers/boards/px4nucleoF767ZI-v1/px4nucleo_can.c b/src/drivers/boards/px4nucleoF767ZI-v1/can.c
similarity index 100%
rename from src/drivers/boards/px4nucleoF767ZI-v1/px4nucleo_can.c
rename to src/drivers/boards/px4nucleoF767ZI-v1/can.c
diff --git a/src/drivers/boards/px4nucleoF767ZI-v1/px4nucleo_init.c b/src/drivers/boards/px4nucleoF767ZI-v1/init.c
similarity index 100%
rename from src/drivers/boards/px4nucleoF767ZI-v1/px4nucleo_init.c
rename to src/drivers/boards/px4nucleoF767ZI-v1/init.c
diff --git a/src/drivers/boards/px4nucleoF767ZI-v1/px4nucleo_led.c b/src/drivers/boards/px4nucleoF767ZI-v1/led.c
similarity index 100%
rename from src/drivers/boards/px4nucleoF767ZI-v1/px4nucleo_led.c
rename to src/drivers/boards/px4nucleoF767ZI-v1/led.c
diff --git a/src/drivers/boards/px4nucleoF767ZI-v1/px4nucleo_sdio.c b/src/drivers/boards/px4nucleoF767ZI-v1/sdio.c
similarity index 100%
rename from src/drivers/boards/px4nucleoF767ZI-v1/px4nucleo_sdio.c
rename to src/drivers/boards/px4nucleoF767ZI-v1/sdio.c
diff --git a/src/drivers/boards/px4nucleoF767ZI-v1/px4nucleo_spi.c b/src/drivers/boards/px4nucleoF767ZI-v1/spi.c
similarity index 100%
rename from src/drivers/boards/px4nucleoF767ZI-v1/px4nucleo_spi.c
rename to src/drivers/boards/px4nucleoF767ZI-v1/spi.c
diff --git a/src/drivers/boards/px4nucleoF767ZI-v1/px4nucleo_timer_config.c b/src/drivers/boards/px4nucleoF767ZI-v1/timer_config.c
similarity index 100%
rename from src/drivers/boards/px4nucleoF767ZI-v1/px4nucleo_timer_config.c
rename to src/drivers/boards/px4nucleoF767ZI-v1/timer_config.c
diff --git a/src/drivers/boards/px4nucleoF767ZI-v1/px4nucleo_usb.c b/src/drivers/boards/px4nucleoF767ZI-v1/usb.c
similarity index 100%
rename from src/drivers/boards/px4nucleoF767ZI-v1/px4nucleo_usb.c
rename to src/drivers/boards/px4nucleoF767ZI-v1/usb.c
diff --git a/src/drivers/boards/s2740vc-v1/CMakeLists.txt b/src/drivers/boards/s2740vc-v1/CMakeLists.txt
index a1842f6b49..c9bbf7bde7 100644
--- a/src/drivers/boards/s2740vc-v1/CMakeLists.txt
+++ b/src/drivers/boards/s2740vc-v1/CMakeLists.txt
@@ -31,22 +31,11 @@
 #
 ############################################################################
 
-message(WARNING-"Configuraton is incomplete")
-message(WARNING-"Configuraton is incomplete")
-message(WARNING-"Configuraton is incomplete")
-message(WARNING-"Configuraton is incomplete")
-message(WARNING-"Configuraton is incomplete")
-message(WARNING-"DO NOT RUN THIS ON HW")
-message(WARNING-"IT IS NOT PINED OUT TO HW")
-message(WARNING-"Configuraton is incomplete")
-message(WARNING-"Configuraton is incomplete")
-message(WARNING-"Configuraton is incomplete")
+message(WARNING "Configuraton is incomplete")
+message(WARNING "DO NOT RUN THIS ON HW")
+message(WARNING "IT IS NOT PINED OUT TO HW")
 
-px4_add_module(
-	MODULE drivers__boards__s2740vc-v1
-	SRCS
-		s2740vc_init.c
-		s2740vc_can.c
-	DEPENDS
-		platforms__common
-	)
\ No newline at end of file
+px4_add_library(drivers_board
+	can.c
+	init.c
+)
diff --git a/src/drivers/boards/s2740vc-v1/s2740vc_can.c b/src/drivers/boards/s2740vc-v1/can.c
similarity index 100%
rename from src/drivers/boards/s2740vc-v1/s2740vc_can.c
rename to src/drivers/boards/s2740vc-v1/can.c
diff --git a/src/drivers/boards/s2740vc-v1/s2740vc_init.c b/src/drivers/boards/s2740vc-v1/init.c
similarity index 100%
rename from src/drivers/boards/s2740vc-v1/s2740vc_init.c
rename to src/drivers/boards/s2740vc-v1/init.c
diff --git a/src/drivers/boards/tap-v1/CMakeLists.txt b/src/drivers/boards/tap-v1/CMakeLists.txt
index 3997902b73..5cef720ee8 100644
--- a/src/drivers/boards/tap-v1/CMakeLists.txt
+++ b/src/drivers/boards/tap-v1/CMakeLists.txt
@@ -31,16 +31,13 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
-px4_add_module(
-	MODULE drivers__boards__tap-v1
-	SRCS
-		tap_init.c
-		tap_pwr.c
-		tap_sdio.c
-		tap_timer_config.c
-		tap_spi.c
-		tap_usb.c
-		tap_led.c
-	DEPENDS
-		platforms__common
-	)
\ No newline at end of file
+
+px4_add_library(drivers_board
+	init.c
+	led.c
+	pwr.c
+	sdio.c
+	spi.c
+	timer_config.c
+	usb.c
+)
diff --git a/src/drivers/boards/tap-v1/tap_init.c b/src/drivers/boards/tap-v1/init.c
similarity index 100%
rename from src/drivers/boards/tap-v1/tap_init.c
rename to src/drivers/boards/tap-v1/init.c
diff --git a/src/drivers/boards/tap-v1/tap_led.c b/src/drivers/boards/tap-v1/led.c
similarity index 100%
rename from src/drivers/boards/tap-v1/tap_led.c
rename to src/drivers/boards/tap-v1/led.c
diff --git a/src/drivers/boards/tap-v1/tap_pwr.c b/src/drivers/boards/tap-v1/pwr.c
similarity index 100%
rename from src/drivers/boards/tap-v1/tap_pwr.c
rename to src/drivers/boards/tap-v1/pwr.c
diff --git a/src/drivers/boards/tap-v1/tap_sdio.c b/src/drivers/boards/tap-v1/sdio.c
similarity index 100%
rename from src/drivers/boards/tap-v1/tap_sdio.c
rename to src/drivers/boards/tap-v1/sdio.c
diff --git a/src/drivers/boards/tap-v1/tap_spi.c b/src/drivers/boards/tap-v1/spi.c
similarity index 100%
rename from src/drivers/boards/tap-v1/tap_spi.c
rename to src/drivers/boards/tap-v1/spi.c
diff --git a/src/drivers/boards/tap-v1/tap_timer_config.c b/src/drivers/boards/tap-v1/timer_config.c
similarity index 100%
rename from src/drivers/boards/tap-v1/tap_timer_config.c
rename to src/drivers/boards/tap-v1/timer_config.c
diff --git a/src/drivers/boards/tap-v1/tap_usb.c b/src/drivers/boards/tap-v1/usb.c
similarity index 100%
rename from src/drivers/boards/tap-v1/tap_usb.c
rename to src/drivers/boards/tap-v1/usb.c
diff --git a/src/drivers/boards/zubaxgnss-v1/CMakeLists.txt b/src/drivers/boards/zubaxgnss-v1/CMakeLists.txt
index 0aeb285370..2260df1ab4 100644
--- a/src/drivers/boards/zubaxgnss-v1/CMakeLists.txt
+++ b/src/drivers/boards/zubaxgnss-v1/CMakeLists.txt
@@ -33,11 +33,7 @@
 
 message(FATAL_ERROR Configuraton is incomplete")
 
-px4_add_module(
-	MODULE drivers__boards__zubaxgnss-v1
-	SRCS
-		zubax_gnss_init.c
-		zubax_gnss_led.c
-	DEPENDS
-		platforms__common
-	)
\ No newline at end of file
+px4_add_library(drivers_board
+	init.c
+	led.c
+)
diff --git a/src/drivers/boards/zubaxgnss-v1/zubax_gnss_init.c b/src/drivers/boards/zubaxgnss-v1/gnss_init.c
similarity index 100%
rename from src/drivers/boards/zubaxgnss-v1/zubax_gnss_init.c
rename to src/drivers/boards/zubaxgnss-v1/gnss_init.c
diff --git a/src/drivers/boards/zubaxgnss-v1/zubax_gnss_led.c b/src/drivers/boards/zubaxgnss-v1/gnss_led.c
similarity index 100%
rename from src/drivers/boards/zubaxgnss-v1/zubax_gnss_led.c
rename to src/drivers/boards/zubaxgnss-v1/gnss_led.c