diff --git a/soc/arm/atmel_sam0/samd20/dts_fixup.h b/soc/arm/atmel_sam0/samd20/dts_fixup.h
index f15d4061c83..3883e8c4ec7 100644
--- a/soc/arm/atmel_sam0/samd20/dts_fixup.h
+++ b/soc/arm/atmel_sam0/samd20/dts_fixup.h
@@ -4,7 +4,7 @@
 
 #define DT_FLASH_DEV_NAME			DT_ATMEL_SAM0_NVMCTRL_41004000_LABEL
 
-#define DT_I2C_0_NAME DT_INST_0_ATMEL_SAM0_I2C_LABEL
+#define DT_I2C_0_NAME DT_LABEL(DT_INST(0, atmel_sam0_i2c))
 
 #define DT_NUM_IRQ_PRIO_BITS	DT_ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS
 
diff --git a/soc/arm/atmel_sam0/samd21/dts_fixup.h b/soc/arm/atmel_sam0/samd21/dts_fixup.h
index 86d642133cb..9f654214e9e 100644
--- a/soc/arm/atmel_sam0/samd21/dts_fixup.h
+++ b/soc/arm/atmel_sam0/samd21/dts_fixup.h
@@ -2,9 +2,9 @@
 
 /* SoC level DTS fixup file */
 
-#define DT_FLASH_DEV_NAME DT_INST_0_ATMEL_SAM0_NVMCTRL_LABEL
+#define DT_FLASH_DEV_NAME DT_LABEL(DT_INST(0, atmel_sam0_nvmctrl))
 
-#define DT_I2C_0_NAME DT_INST_0_ATMEL_SAM0_I2C_LABEL
+#define DT_I2C_0_NAME DT_LABEL(DT_INST(0, atmel_sam0_i2c))
 
 #define DT_NUM_IRQ_PRIO_BITS	DT_ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS
 
diff --git a/soc/arm/atmel_sam0/samd51/dts_fixup.h b/soc/arm/atmel_sam0/samd51/dts_fixup.h
index 51a75e7dab5..68f1f83b3ea 100644
--- a/soc/arm/atmel_sam0/samd51/dts_fixup.h
+++ b/soc/arm/atmel_sam0/samd51/dts_fixup.h
@@ -6,7 +6,7 @@
 
 /* SoC level DTS fixup file */
 
-#define DT_FLASH_DEV_NAME DT_INST_0_ATMEL_SAM0_NVMCTRL_LABEL
+#define DT_FLASH_DEV_NAME DT_LABEL(DT_INST(0, atmel_sam0_nvmctrl))
 
 #define DT_NUM_IRQ_PRIO_BITS	DT_ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS
 
diff --git a/soc/arm/atmel_sam0/same51/dts_fixup.h b/soc/arm/atmel_sam0/same51/dts_fixup.h
index 51a75e7dab5..68f1f83b3ea 100644
--- a/soc/arm/atmel_sam0/same51/dts_fixup.h
+++ b/soc/arm/atmel_sam0/same51/dts_fixup.h
@@ -6,7 +6,7 @@
 
 /* SoC level DTS fixup file */
 
-#define DT_FLASH_DEV_NAME DT_INST_0_ATMEL_SAM0_NVMCTRL_LABEL
+#define DT_FLASH_DEV_NAME DT_LABEL(DT_INST(0, atmel_sam0_nvmctrl))
 
 #define DT_NUM_IRQ_PRIO_BITS	DT_ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS
 
diff --git a/soc/arm/atmel_sam0/same53/dts_fixup.h b/soc/arm/atmel_sam0/same53/dts_fixup.h
index 51a75e7dab5..68f1f83b3ea 100644
--- a/soc/arm/atmel_sam0/same53/dts_fixup.h
+++ b/soc/arm/atmel_sam0/same53/dts_fixup.h
@@ -6,7 +6,7 @@
 
 /* SoC level DTS fixup file */
 
-#define DT_FLASH_DEV_NAME DT_INST_0_ATMEL_SAM0_NVMCTRL_LABEL
+#define DT_FLASH_DEV_NAME DT_LABEL(DT_INST(0, atmel_sam0_nvmctrl))
 
 #define DT_NUM_IRQ_PRIO_BITS	DT_ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS
 
diff --git a/soc/arm/atmel_sam0/same54/dts_fixup.h b/soc/arm/atmel_sam0/same54/dts_fixup.h
index 51a75e7dab5..68f1f83b3ea 100644
--- a/soc/arm/atmel_sam0/same54/dts_fixup.h
+++ b/soc/arm/atmel_sam0/same54/dts_fixup.h
@@ -6,7 +6,7 @@
 
 /* SoC level DTS fixup file */
 
-#define DT_FLASH_DEV_NAME DT_INST_0_ATMEL_SAM0_NVMCTRL_LABEL
+#define DT_FLASH_DEV_NAME DT_LABEL(DT_INST(0, atmel_sam0_nvmctrl))
 
 #define DT_NUM_IRQ_PRIO_BITS	DT_ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS
 
diff --git a/soc/arm/atmel_sam0/samr21/dts_fixup.h b/soc/arm/atmel_sam0/samr21/dts_fixup.h
index c98aa07b99d..4523a57ce7a 100644
--- a/soc/arm/atmel_sam0/samr21/dts_fixup.h
+++ b/soc/arm/atmel_sam0/samr21/dts_fixup.h
@@ -6,9 +6,9 @@
 
 /* SoC level DTS fixup file */
 
-#define DT_FLASH_DEV_NAME DT_INST_0_ATMEL_SAM0_NVMCTRL_LABEL
+#define DT_FLASH_DEV_NAME DT_LABEL(DT_INST(0, atmel_sam0_nvmctrl))
 
-#define DT_I2C_0_NAME DT_INST_0_ATMEL_SAM0_I2C_LABEL
+#define DT_I2C_0_NAME DT_LABEL(DT_INST(0, atmel_sam0_i2c))
 
 #define DT_NUM_IRQ_PRIO_BITS	DT_ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS