diff --git a/sw/airborne/arch/avr/mcu_periph/spi_arch.c b/sw/airborne/arch/avr/mcu_periph/spi_arch.c
index 558b06a7e2..e2dc0bda80 100644
--- a/sw/airborne/arch/avr/mcu_periph/spi_arch.c
+++ b/sw/airborne/arch/avr/mcu_periph/spi_arch.c
@@ -22,7 +22,7 @@
  *
  */
 
-/** \file spi_hw.c
+/** \file mcu_periph/spi_arch.c
  *  \brief handling of hardware dependant SPI on AVR architecture
  */
 
diff --git a/sw/airborne/arch/avr/mcu_periph/spi_arch.h b/sw/airborne/arch/avr/mcu_periph/spi_arch.h
index 384009ff61..e76d1f9429 100644
--- a/sw/airborne/arch/avr/mcu_periph/spi_arch.h
+++ b/sw/airborne/arch/avr/mcu_periph/spi_arch.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SPI_HW_H
-#define SPI_HW_H
+#ifndef SPI_ARCH_H
+#define SPI_ARCH_H
 
 /** Index in SPI buffers: one is enough for full duplex communication */
 extern volatile uint8_t spi_idx_buf;
@@ -83,4 +83,4 @@ extern volatile uint8_t spi_idx_buf;
 #endif /* SPI_MASTER */
 
 
-#endif /* SPI_HW_H */
+#endif /* SPI_ARCH_H */
diff --git a/sw/airborne/arch/lpc21/mcu_periph/spi_arch.h b/sw/airborne/arch/lpc21/mcu_periph/spi_arch.h
index 8bd15491a2..6e05e44168 100644
--- a/sw/airborne/arch/lpc21/mcu_periph/spi_arch.h
+++ b/sw/airborne/arch/lpc21/mcu_periph/spi_arch.h
@@ -25,8 +25,8 @@
  *  for now only SPI1 ( aka SSP )
  */
 
-#ifndef SPI_HW_H
-#define SPI_HW_H
+#ifndef SPI_ARCH_H
+#define SPI_ARCH_H
 
 #include "std.h"
 #include "LPC21xx.h"
@@ -192,4 +192,4 @@ extern volatile uint8_t spi_rx_idx;
 #define SpiClrCPHA() (SSPCR0 &= ~(_BV(7)))
 
 
-#endif /* SPI_HW_H */
+#endif /* SPI_ARCH_H */
diff --git a/sw/airborne/csc/csc_baro.c b/sw/airborne/csc/csc_baro.c
index e51835f845..ed6ddf8278 100644
--- a/sw/airborne/csc/csc_baro.c
+++ b/sw/airborne/csc/csc_baro.c
@@ -10,7 +10,7 @@
 #include "csc_booz2_ins.h"
 #include "csc_ap_link.h"
 
-#include "spi_hw.h"
+#include "mcu_periph/spi_arch.h"
 
 #include "csc_baro.h"
 
diff --git a/sw/airborne/modules/max3100/max3100_hw.h b/sw/airborne/modules/max3100/max3100_hw.h
index 0847bedf04..97bfa18cba 100644
--- a/sw/airborne/modules/max3100/max3100_hw.h
+++ b/sw/airborne/modules/max3100/max3100_hw.h
@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 #include "std.h"
-#include "mcu_periph/spi_hw.h"
+#include "mcu_periph/spi_arch.h"
 #include "led.h"
 
 /* Pin configuration for max3100 IRQ */