diff --git a/boards/arm/96b_argonkey/dts.fixup b/boards/arm/96b_argonkey/dts_fixup.h
similarity index 100%
rename from boards/arm/96b_argonkey/dts.fixup
rename to boards/arm/96b_argonkey/dts_fixup.h
diff --git a/boards/arm/96b_carbon/dts.fixup b/boards/arm/96b_carbon/dts_fixup.h
similarity index 100%
rename from boards/arm/96b_carbon/dts.fixup
rename to boards/arm/96b_carbon/dts_fixup.h
diff --git a/boards/arm/96b_neonkey/dts.fixup b/boards/arm/96b_neonkey/dts_fixup.h
similarity index 100%
rename from boards/arm/96b_neonkey/dts.fixup
rename to boards/arm/96b_neonkey/dts_fixup.h
diff --git a/boards/arm/disco_l475_iot1/dts.fixup b/boards/arm/disco_l475_iot1/dts_fixup.h
similarity index 100%
rename from boards/arm/disco_l475_iot1/dts.fixup
rename to boards/arm/disco_l475_iot1/dts_fixup.h
diff --git a/boards/arm/frdm_k64f/dts.fixup b/boards/arm/frdm_k64f/dts_fixup.h
similarity index 100%
rename from boards/arm/frdm_k64f/dts.fixup
rename to boards/arm/frdm_k64f/dts_fixup.h
diff --git a/boards/arm/frdm_kl25z/dts.fixup b/boards/arm/frdm_kl25z/dts_fixup.h
similarity index 100%
rename from boards/arm/frdm_kl25z/dts.fixup
rename to boards/arm/frdm_kl25z/dts_fixup.h
diff --git a/boards/arm/frdm_kw41z/dts.fixup b/boards/arm/frdm_kw41z/dts_fixup.h
similarity index 100%
rename from boards/arm/frdm_kw41z/dts.fixup
rename to boards/arm/frdm_kw41z/dts_fixup.h
diff --git a/boards/arm/hexiwear_k64/dts.fixup b/boards/arm/hexiwear_k64/dts_fixup.h
similarity index 100%
rename from boards/arm/hexiwear_k64/dts.fixup
rename to boards/arm/hexiwear_k64/dts_fixup.h
diff --git a/boards/arm/mps2_an385/dts.fixup b/boards/arm/mps2_an385/dts_fixup.h
similarity index 100%
rename from boards/arm/mps2_an385/dts.fixup
rename to boards/arm/mps2_an385/dts_fixup.h
diff --git a/boards/arm/nrf52_pca20020/dts.fixup b/boards/arm/nrf52_pca20020/dts_fixup.h
similarity index 100%
rename from boards/arm/nrf52_pca20020/dts.fixup
rename to boards/arm/nrf52_pca20020/dts_fixup.h
diff --git a/boards/arm/olimexino_stm32/dts.fixup b/boards/arm/olimexino_stm32/dts_fixup.h
similarity index 100%
rename from boards/arm/olimexino_stm32/dts.fixup
rename to boards/arm/olimexino_stm32/dts_fixup.h
diff --git a/boards/arm/reel_board/dts.fixup b/boards/arm/reel_board/dts_fixup.h
similarity index 100%
rename from boards/arm/reel_board/dts.fixup
rename to boards/arm/reel_board/dts_fixup.h
diff --git a/boards/arm/warp7_m4/dts.fixup b/boards/arm/warp7_m4/dts_fixup.h
similarity index 100%
rename from boards/arm/warp7_m4/dts.fixup
rename to boards/arm/warp7_m4/dts_fixup.h
diff --git a/boards/shields/x_nucleo_iks01a1/dts.fixup b/boards/shields/x_nucleo_iks01a1/dts_fixup.h
similarity index 100%
rename from boards/shields/x_nucleo_iks01a1/dts.fixup
rename to boards/shields/x_nucleo_iks01a1/dts_fixup.h
diff --git a/boards/shields/x_nucleo_iks01a2/dts.fixup b/boards/shields/x_nucleo_iks01a2/dts_fixup.h
similarity index 100%
rename from boards/shields/x_nucleo_iks01a2/dts.fixup
rename to boards/shields/x_nucleo_iks01a2/dts_fixup.h
diff --git a/boards/x86/up_squared/dts.fixup b/boards/x86/up_squared/dts_fixup.h
similarity index 100%
rename from boards/x86/up_squared/dts.fixup
rename to boards/x86/up_squared/dts_fixup.h
diff --git a/boards/xtensa/intel_s1000_crb/dts.fixup b/boards/xtensa/intel_s1000_crb/dts_fixup.h
similarity index 100%
rename from boards/xtensa/intel_s1000_crb/dts.fixup
rename to boards/xtensa/intel_s1000_crb/dts_fixup.h
diff --git a/cmake/dts.cmake b/cmake/dts.cmake
index ea5ff915c46..8a8a0aaf814 100644
--- a/cmake/dts.cmake
+++ b/cmake/dts.cmake
@@ -42,14 +42,14 @@ foreach(shield_path ${shields_refs_list})
 
   if(${shield_config})
     # if shield config flag is on, add shield overlay to the shield overlays
-    # list and dts.fixup file to the shield fixup file
+    # list and dts_fixup file to the shield fixup file
     list(APPEND
       dts_files
       ${shield_dir}/${shield_path}
       )
     list(APPEND
       dts_fixups
-      ${shield_dir}/${shield}/dts.fixup
+      ${shield_dir}/${shield}/dts_fixup.h
       )
   endif()
 endforeach()
@@ -121,13 +121,13 @@ if(CONFIG_HAS_DTS)
 
   # Run extract_dts_includes.py for the header file
   # generated_dts_board.h
-  set_ifndef(DTS_BOARD_FIXUP_FILE ${BOARD_DIR}/dts.fixup)
-  set_ifndef(DTS_SOC_FIXUP_FILE   ${PROJECT_SOURCE_DIR}/soc/${ARCH}/${SOC_PATH}/dts.fixup)
+  set_ifndef(DTS_BOARD_FIXUP_FILE ${BOARD_DIR}/dts_fixup.h)
+  set_ifndef(DTS_SOC_FIXUP_FILE   ${PROJECT_SOURCE_DIR}/soc/${ARCH}/${SOC_PATH}/dts_fixup.h)
 
   list(APPEND dts_fixups
     ${DTS_BOARD_FIXUP_FILE}
     ${DTS_SOC_FIXUP_FILE}
-    ${APPLICATION_SOURCE_DIR}/dts.fixup
+    ${APPLICATION_SOURCE_DIR}/dts_fixup.h
     )
 
   foreach(fixup ${dts_fixups})
diff --git a/doc/application/application.rst b/doc/application/application.rst
index f4895d3eb39..5c60a15205b 100644
--- a/doc/application/application.rst
+++ b/doc/application/application.rst
@@ -447,7 +447,7 @@ Zephyr board, and provide the following files::
     board.h
     CMakeLists.txt
     doc/
-    dts.fixup
+    dts_fixup.h
     Kconfig.board
     Kconfig.defconfig
     pinmux.c
diff --git a/doc/devices/dts/device_tree.rst b/doc/devices/dts/device_tree.rst
index f955791f861..2a490f33202 100644
--- a/doc/devices/dts/device_tree.rst
+++ b/doc/devices/dts/device_tree.rst
@@ -71,8 +71,8 @@ information is placed in a header file that is used by the rest of the code as
 the project is compiled.
 
 A temporary fixup file is required for device tree support on most devices.
-This .fixup file by default resides in the board directory and is named
-dts.fixup.  This fixup file maps the generated include information to the
+This fixup file by default resides in the board directory and is named
+dts_fixup.h.  This fixup file maps the generated include information to the
 current driver/source usage.
 
 .. _dt_vs_kconfig:
diff --git a/doc/porting/shields.rst b/doc/porting/shields.rst
index 6ad26646d80..7c261625a3e 100644
--- a/doc/porting/shields.rst
+++ b/doc/porting/shields.rst
@@ -20,7 +20,7 @@ under :file:`/boards/shields`:
    ├── Kconfig.shield
    ├── Kconfig.defconfig
    ├── <shield>.overlay
-   └── dts.fixup
+   └── dts_fixup.h
 
 These files provides shield configuration as follows:
 
@@ -37,7 +37,7 @@ These files provides shield configuration as follows:
   format that is merged with the board's device tree information before
   compilation.
 
-* **dts.fixup**: This is a fixup file to bind board components definitions with
+* **dts_fixup.h**: This is a fixup file to bind board components definitions with
   application in a generic fashion to enable shield compatibility across boards
 
 Board compatibility
diff --git a/samples/boards/arduino_101/environmental_sensing/sensor/dts.fixup b/samples/boards/arduino_101/environmental_sensing/sensor/dts_fixup.h
similarity index 100%
rename from samples/boards/arduino_101/environmental_sensing/sensor/dts.fixup
rename to samples/boards/arduino_101/environmental_sensing/sensor/dts_fixup.h
diff --git a/samples/drivers/led_lp5562/dts.fixup b/samples/drivers/led_lp5562/dts_fixup.h
similarity index 100%
rename from samples/drivers/led_lp5562/dts.fixup
rename to samples/drivers/led_lp5562/dts_fixup.h
diff --git a/samples/drivers/led_pca9633/dts.fixup b/samples/drivers/led_pca9633/dts_fixup.h
similarity index 100%
rename from samples/drivers/led_pca9633/dts.fixup
rename to samples/drivers/led_pca9633/dts_fixup.h
diff --git a/samples/sensor/adt7420/dts.fixup b/samples/sensor/adt7420/dts_fixup.h
similarity index 100%
rename from samples/sensor/adt7420/dts.fixup
rename to samples/sensor/adt7420/dts_fixup.h
diff --git a/samples/sensor/adxl372/dts.fixup b/samples/sensor/adxl372/dts_fixup.h
similarity index 100%
rename from samples/sensor/adxl372/dts.fixup
rename to samples/sensor/adxl372/dts_fixup.h
diff --git a/samples/sensor/ccs811/dts.fixup b/samples/sensor/ccs811/dts_fixup.h
similarity index 100%
rename from samples/sensor/ccs811/dts.fixup
rename to samples/sensor/ccs811/dts_fixup.h
diff --git a/soc/arc/quark_se_c1000_ss/dts.fixup b/soc/arc/quark_se_c1000_ss/dts_fixup.h
similarity index 100%
rename from soc/arc/quark_se_c1000_ss/dts.fixup
rename to soc/arc/quark_se_c1000_ss/dts_fixup.h
diff --git a/soc/arc/snps_emsk/dts.fixup b/soc/arc/snps_emsk/dts_fixup.h
similarity index 100%
rename from soc/arc/snps_emsk/dts.fixup
rename to soc/arc/snps_emsk/dts_fixup.h
diff --git a/soc/arc/snps_nsim/dts.fixup b/soc/arc/snps_nsim/dts_fixup.h
similarity index 100%
rename from soc/arc/snps_nsim/dts.fixup
rename to soc/arc/snps_nsim/dts_fixup.h
diff --git a/soc/arm/arm/beetle/dts.fixup b/soc/arm/arm/beetle/dts_fixup.h
similarity index 100%
rename from soc/arm/arm/beetle/dts.fixup
rename to soc/arm/arm/beetle/dts_fixup.h
diff --git a/soc/arm/atmel_sam/sam3x/dts.fixup b/soc/arm/atmel_sam/sam3x/dts_fixup.h
similarity index 100%
rename from soc/arm/atmel_sam/sam3x/dts.fixup
rename to soc/arm/atmel_sam/sam3x/dts_fixup.h
diff --git a/soc/arm/atmel_sam/sam4s/dts.fixup b/soc/arm/atmel_sam/sam4s/dts_fixup.h
similarity index 100%
rename from soc/arm/atmel_sam/sam4s/dts.fixup
rename to soc/arm/atmel_sam/sam4s/dts_fixup.h
diff --git a/soc/arm/atmel_sam/same70/dts.fixup b/soc/arm/atmel_sam/same70/dts_fixup.h
similarity index 100%
rename from soc/arm/atmel_sam/same70/dts.fixup
rename to soc/arm/atmel_sam/same70/dts_fixup.h
diff --git a/soc/arm/atmel_sam0/samd20/dts.fixup b/soc/arm/atmel_sam0/samd20/dts_fixup.h
similarity index 100%
rename from soc/arm/atmel_sam0/samd20/dts.fixup
rename to soc/arm/atmel_sam0/samd20/dts_fixup.h
diff --git a/soc/arm/atmel_sam0/samd21/dts.fixup b/soc/arm/atmel_sam0/samd21/dts_fixup.h
similarity index 100%
rename from soc/arm/atmel_sam0/samd21/dts.fixup
rename to soc/arm/atmel_sam0/samd21/dts_fixup.h
diff --git a/soc/arm/cypress/psoc6/dts.fixup b/soc/arm/cypress/psoc6/dts_fixup.h
similarity index 100%
rename from soc/arm/cypress/psoc6/dts.fixup
rename to soc/arm/cypress/psoc6/dts_fixup.h
diff --git a/soc/arm/nordic_nrf/nrf51/dts.fixup b/soc/arm/nordic_nrf/nrf51/dts_fixup.h
similarity index 100%
rename from soc/arm/nordic_nrf/nrf51/dts.fixup
rename to soc/arm/nordic_nrf/nrf51/dts_fixup.h
diff --git a/soc/arm/nordic_nrf/nrf52/dts.fixup b/soc/arm/nordic_nrf/nrf52/dts_fixup.h
similarity index 100%
rename from soc/arm/nordic_nrf/nrf52/dts.fixup
rename to soc/arm/nordic_nrf/nrf52/dts_fixup.h
diff --git a/soc/arm/nxp_imx/mcimx6x_m4/dts.fixup b/soc/arm/nxp_imx/mcimx6x_m4/dts_fixup.h
similarity index 100%
rename from soc/arm/nxp_imx/mcimx6x_m4/dts.fixup
rename to soc/arm/nxp_imx/mcimx6x_m4/dts_fixup.h
diff --git a/soc/arm/nxp_imx/mcimx7_m4/dts.fixup b/soc/arm/nxp_imx/mcimx7_m4/dts_fixup.h
similarity index 100%
rename from soc/arm/nxp_imx/mcimx7_m4/dts.fixup
rename to soc/arm/nxp_imx/mcimx7_m4/dts_fixup.h
diff --git a/soc/arm/nxp_imx/rt/dts.fixup b/soc/arm/nxp_imx/rt/dts_fixup.h
similarity index 100%
rename from soc/arm/nxp_imx/rt/dts.fixup
rename to soc/arm/nxp_imx/rt/dts_fixup.h
diff --git a/soc/arm/nxp_kinetis/k6x/dts.fixup b/soc/arm/nxp_kinetis/k6x/dts_fixup.h
similarity index 100%
rename from soc/arm/nxp_kinetis/k6x/dts.fixup
rename to soc/arm/nxp_kinetis/k6x/dts_fixup.h
diff --git a/soc/arm/nxp_kinetis/kl2x/dts.fixup b/soc/arm/nxp_kinetis/kl2x/dts_fixup.h
similarity index 100%
rename from soc/arm/nxp_kinetis/kl2x/dts.fixup
rename to soc/arm/nxp_kinetis/kl2x/dts_fixup.h
diff --git a/soc/arm/nxp_kinetis/kwx/dts.fixup b/soc/arm/nxp_kinetis/kwx/dts_fixup.h
similarity index 100%
rename from soc/arm/nxp_kinetis/kwx/dts.fixup
rename to soc/arm/nxp_kinetis/kwx/dts_fixup.h
diff --git a/soc/arm/nxp_lpc/lpc54xxx/dts.fixup b/soc/arm/nxp_lpc/lpc54xxx/dts_fixup.h
similarity index 100%
rename from soc/arm/nxp_lpc/lpc54xxx/dts.fixup
rename to soc/arm/nxp_lpc/lpc54xxx/dts_fixup.h
diff --git a/soc/arm/silabs_exx32/efm32wg/dts.fixup b/soc/arm/silabs_exx32/efm32wg/dts_fixup.h
similarity index 100%
rename from soc/arm/silabs_exx32/efm32wg/dts.fixup
rename to soc/arm/silabs_exx32/efm32wg/dts_fixup.h
diff --git a/soc/arm/silabs_exx32/efr32fg1p/dts.fixup b/soc/arm/silabs_exx32/efr32fg1p/dts_fixup.h
similarity index 100%
rename from soc/arm/silabs_exx32/efr32fg1p/dts.fixup
rename to soc/arm/silabs_exx32/efr32fg1p/dts_fixup.h
diff --git a/soc/arm/st_stm32/stm32f0/dts.fixup b/soc/arm/st_stm32/stm32f0/dts_fixup.h
similarity index 100%
rename from soc/arm/st_stm32/stm32f0/dts.fixup
rename to soc/arm/st_stm32/stm32f0/dts_fixup.h
diff --git a/soc/arm/st_stm32/stm32f1/dts.fixup b/soc/arm/st_stm32/stm32f1/dts_fixup.h
similarity index 100%
rename from soc/arm/st_stm32/stm32f1/dts.fixup
rename to soc/arm/st_stm32/stm32f1/dts_fixup.h
diff --git a/soc/arm/st_stm32/stm32f2/dts.fixup b/soc/arm/st_stm32/stm32f2/dts_fixup.h
similarity index 100%
rename from soc/arm/st_stm32/stm32f2/dts.fixup
rename to soc/arm/st_stm32/stm32f2/dts_fixup.h
diff --git a/soc/arm/st_stm32/stm32f3/dts.fixup b/soc/arm/st_stm32/stm32f3/dts_fixup.h
similarity index 100%
rename from soc/arm/st_stm32/stm32f3/dts.fixup
rename to soc/arm/st_stm32/stm32f3/dts_fixup.h
diff --git a/soc/arm/st_stm32/stm32f4/dts.fixup b/soc/arm/st_stm32/stm32f4/dts_fixup.h
similarity index 100%
rename from soc/arm/st_stm32/stm32f4/dts.fixup
rename to soc/arm/st_stm32/stm32f4/dts_fixup.h
diff --git a/soc/arm/st_stm32/stm32f7/dts.fixup b/soc/arm/st_stm32/stm32f7/dts_fixup.h
similarity index 100%
rename from soc/arm/st_stm32/stm32f7/dts.fixup
rename to soc/arm/st_stm32/stm32f7/dts_fixup.h
diff --git a/soc/arm/st_stm32/stm32l0/dts.fixup b/soc/arm/st_stm32/stm32l0/dts_fixup.h
similarity index 100%
rename from soc/arm/st_stm32/stm32l0/dts.fixup
rename to soc/arm/st_stm32/stm32l0/dts_fixup.h
diff --git a/soc/arm/st_stm32/stm32l4/dts.fixup b/soc/arm/st_stm32/stm32l4/dts_fixup.h
similarity index 100%
rename from soc/arm/st_stm32/stm32l4/dts.fixup
rename to soc/arm/st_stm32/stm32l4/dts_fixup.h
diff --git a/soc/arm/ti_lm3s6965/dts.fixup b/soc/arm/ti_lm3s6965/dts_fixup.h
similarity index 100%
rename from soc/arm/ti_lm3s6965/dts.fixup
rename to soc/arm/ti_lm3s6965/dts_fixup.h
diff --git a/soc/arm/ti_simplelink/cc2650/dts.fixup b/soc/arm/ti_simplelink/cc2650/dts_fixup.h
similarity index 100%
rename from soc/arm/ti_simplelink/cc2650/dts.fixup
rename to soc/arm/ti_simplelink/cc2650/dts_fixup.h
diff --git a/soc/arm/ti_simplelink/cc32xx/dts.fixup b/soc/arm/ti_simplelink/cc32xx/dts_fixup.h
similarity index 100%
rename from soc/arm/ti_simplelink/cc32xx/dts.fixup
rename to soc/arm/ti_simplelink/cc32xx/dts_fixup.h
diff --git a/soc/arm/ti_simplelink/msp432p4xx/dts.fixup b/soc/arm/ti_simplelink/msp432p4xx/dts_fixup.h
similarity index 100%
rename from soc/arm/ti_simplelink/msp432p4xx/dts.fixup
rename to soc/arm/ti_simplelink/msp432p4xx/dts_fixup.h
diff --git a/soc/nios2/nios2-qemu/dts.fixup b/soc/nios2/nios2-qemu/dts_fixup.h
similarity index 100%
rename from soc/nios2/nios2-qemu/dts.fixup
rename to soc/nios2/nios2-qemu/dts_fixup.h
diff --git a/soc/nios2/nios2f-zephyr/dts.fixup b/soc/nios2/nios2f-zephyr/dts_fixup.h
similarity index 100%
rename from soc/nios2/nios2f-zephyr/dts.fixup
rename to soc/nios2/nios2f-zephyr/dts_fixup.h
diff --git a/soc/riscv32/pulpino/dts.fixup b/soc/riscv32/pulpino/dts_fixup.h
similarity index 100%
rename from soc/riscv32/pulpino/dts.fixup
rename to soc/riscv32/pulpino/dts_fixup.h
diff --git a/soc/riscv32/riscv-privilege/riscv32-qemu/dts.fixup b/soc/riscv32/riscv-privilege/riscv32-qemu/dts_fixup.h
similarity index 100%
rename from soc/riscv32/riscv-privilege/riscv32-qemu/dts.fixup
rename to soc/riscv32/riscv-privilege/riscv32-qemu/dts_fixup.h
diff --git a/soc/riscv32/riscv-privilege/sifive-freedom/dts.fixup b/soc/riscv32/riscv-privilege/sifive-freedom/dts_fixup.h
similarity index 100%
rename from soc/riscv32/riscv-privilege/sifive-freedom/dts.fixup
rename to soc/riscv32/riscv-privilege/sifive-freedom/dts_fixup.h
diff --git a/soc/x86/apollo_lake/dts.fixup b/soc/x86/apollo_lake/dts_fixup.h
similarity index 100%
rename from soc/x86/apollo_lake/dts.fixup
rename to soc/x86/apollo_lake/dts_fixup.h
diff --git a/soc/x86/atom/dts.fixup b/soc/x86/atom/dts_fixup.h
similarity index 100%
rename from soc/x86/atom/dts.fixup
rename to soc/x86/atom/dts_fixup.h
diff --git a/soc/x86/ia32/dts.fixup b/soc/x86/ia32/dts_fixup.h
similarity index 100%
rename from soc/x86/ia32/dts.fixup
rename to soc/x86/ia32/dts_fixup.h
diff --git a/soc/x86/intel_quark/quark_d2000/dts.fixup b/soc/x86/intel_quark/quark_d2000/dts_fixup.h
similarity index 100%
rename from soc/x86/intel_quark/quark_d2000/dts.fixup
rename to soc/x86/intel_quark/quark_d2000/dts_fixup.h
diff --git a/soc/x86/intel_quark/quark_se/dts.fixup b/soc/x86/intel_quark/quark_se/dts_fixup.h
similarity index 100%
rename from soc/x86/intel_quark/quark_se/dts.fixup
rename to soc/x86/intel_quark/quark_se/dts_fixup.h
diff --git a/soc/x86/intel_quark/quark_x1000/dts.fixup b/soc/x86/intel_quark/quark_x1000/dts_fixup.h
similarity index 100%
rename from soc/x86/intel_quark/quark_x1000/dts.fixup
rename to soc/x86/intel_quark/quark_x1000/dts_fixup.h
diff --git a/soc/xtensa/intel_s1000/dts.fixup b/soc/xtensa/intel_s1000/dts_fixup.h
similarity index 100%
rename from soc/xtensa/intel_s1000/dts.fixup
rename to soc/xtensa/intel_s1000/dts_fixup.h
diff --git a/tests/drivers/build_all/dts.fixup b/tests/drivers/build_all/dts_fixup.h
similarity index 100%
rename from tests/drivers/build_all/dts.fixup
rename to tests/drivers/build_all/dts_fixup.h