diff --git a/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52832 b/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52832_QFAA
similarity index 79%
rename from arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52832
rename to arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52832_QFAA
index 29f66eaf010..3fe65841cd8 100644
--- a/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52832
+++ b/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52832_QFAA
@@ -6,11 +6,11 @@
 #
 
 
-if SOC_NRF52832
+if SOC_NRF52832_QFAA
 
 config SOC
 	string
-	default nRF52832
+	default nRF52832_QFAA
 
 config SRAM_SIZE
 	default 64
@@ -22,5 +22,5 @@ config NUM_IRQS
 	int
 	default 39
 
-endif # SOC_NRF52832
+endif # SOC_NRF52832_QFAA
 
diff --git a/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52840 b/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52840_QIAA
similarity index 79%
rename from arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52840
rename to arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52840_QIAA
index d880477537c..63435486a87 100644
--- a/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52840
+++ b/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52840_QIAA
@@ -6,11 +6,11 @@
 #
 
 
-if SOC_NRF52840
+if SOC_NRF52840_QIAA
 
 config SOC
 	string
-	default nRF52840
+	default nRF52840_QIAA
 
 config SRAM_SIZE
 	default 256
@@ -22,5 +22,5 @@ config NUM_IRQS
 	int
 	default 46
 
-endif # SOC_NRF52840
+endif # SOC_NRF52840_QIAA
 
diff --git a/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.soc b/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.soc
index 1a36ae8e15a..3f1f73736e1 100644
--- a/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.soc
+++ b/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.soc
@@ -5,14 +5,24 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
+config SOC_NRF52832
+	depends on SOC_SERIES_NRF52X
+	bool
+
+config SOC_NRF52840
+	depends on SOC_SERIES_NRF52X
+	bool
+
 choice
 prompt "nRF52x MCU Selection"
 depends on SOC_SERIES_NRF52X
 
-config SOC_NRF52832
-	bool "NRF52832"
+config SOC_NRF52832_QFAA
+	bool "NRF52832_QFAA"
+	select SOC_NRF52832
 
-config SOC_NRF52840
-	bool "NRF52840"
+config SOC_NRF52840_QIAA
+	bool "NRF52840_QIAA"
+	select SOC_NRF52840
 
 endchoice
diff --git a/boards/arm/96b_nitrogen/Kconfig.board b/boards/arm/96b_nitrogen/Kconfig.board
index d540cbfae67..863c37be38f 100644
--- a/boards/arm/96b_nitrogen/Kconfig.board
+++ b/boards/arm/96b_nitrogen/Kconfig.board
@@ -6,4 +6,4 @@
 
 config BOARD_96B_NITROGEN
 	bool "96Boards Nitrogen"
-	depends on SOC_NRF52832
+	depends on SOC_NRF52832_QFAA
diff --git a/boards/arm/nrf52840_pca10056/Kconfig.board b/boards/arm/nrf52840_pca10056/Kconfig.board
index 676a2038c12..4504da46527 100644
--- a/boards/arm/nrf52840_pca10056/Kconfig.board
+++ b/boards/arm/nrf52840_pca10056/Kconfig.board
@@ -6,4 +6,4 @@
 
 config  BOARD_NRF52840_PCA10056
 	bool "NRF52840 PCA10056"
-	depends on SOC_NRF52840
+	depends on SOC_NRF52840_QIAA
diff --git a/boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig b/boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig
index 179d2e99e33..9ae816a6e18 100644
--- a/boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig
+++ b/boards/arm/nrf52840_pca10056/nrf52840_pca10056_defconfig
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_SOC_FAMILY_NRF5=y
 CONFIG_SOC_SERIES_NRF52X=y
-CONFIG_SOC_NRF52840=y
+CONFIG_SOC_NRF52840_QIAA=y
 CONFIG_BOARD_NRF52840_PCA10056=y
 
 # enable uart driver
diff --git a/boards/arm/nrf52_blenano2/Kconfig.board b/boards/arm/nrf52_blenano2/Kconfig.board
index 7cc47840002..3ea15fe40dc 100644
--- a/boards/arm/nrf52_blenano2/Kconfig.board
+++ b/boards/arm/nrf52_blenano2/Kconfig.board
@@ -7,4 +7,4 @@
 
 config BOARD_NRF52_BLENANO2
 	bool "nRF52 BLENANO2"
-	depends on SOC_NRF52832
+	depends on SOC_NRF52832_QFAA
diff --git a/boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig b/boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig
index 6f878637ce4..71fe9bd1a39 100644
--- a/boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig
+++ b/boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_SOC_FAMILY_NRF5=y
 CONFIG_SOC_SERIES_NRF52X=y
-CONFIG_SOC_NRF52832=y
+CONFIG_SOC_NRF52832_QFAA=y
 CONFIG_BOARD_NRF52_BLENANO2=y
 
 # enable uart driver
diff --git a/boards/arm/nrf52_pca10040/Kconfig.board b/boards/arm/nrf52_pca10040/Kconfig.board
index 49b6e1895d6..a66de1f09f3 100644
--- a/boards/arm/nrf52_pca10040/Kconfig.board
+++ b/boards/arm/nrf52_pca10040/Kconfig.board
@@ -6,4 +6,4 @@
 
 config  BOARD_NRF52_PCA10040
 	bool "nRF52 PCA10040"
-	depends on SOC_NRF52832
+	depends on SOC_NRF52832_QFAA
diff --git a/boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig b/boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig
index 5f175c009c2..c8519fe923c 100644
--- a/boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig
+++ b/boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_SOC_FAMILY_NRF5=y
 CONFIG_SOC_SERIES_NRF52X=y
-CONFIG_SOC_NRF52832=y
+CONFIG_SOC_NRF52832_QFAA=y
 CONFIG_BOARD_NRF52_PCA10040=y
 
 # enable uart driver