diff --git a/configs/saml21-xplained/Kconfig b/configs/saml21-xplained/Kconfig
index 1f6fb9a612..5572d5b6ae 100644
--- a/configs/saml21-xplained/Kconfig
+++ b/configs/saml21-xplained/Kconfig
@@ -25,7 +25,7 @@ config SAML21_XPLAINED_OSC16M_16MHZ
 
 endchoice # OSC16M Frequency
 
-config SAM21_XPLAINED_XOSC32K
+config SAMD21_XPLAINED_XOSC32K
 	bool "Enable XOSC32K"
 	default n
 
@@ -43,7 +43,7 @@ config SAML21_XPLAINED_DFLL_OSC16MSRC
 
 config SAML21_XPLAINED_DFLL_XOSC32KSRC
 	bool "XOSCK32K"
-	select SAM21_XPLAINED_XOSC32K
+	select SAMD21_XPLAINED_XOSC32K
 
 endchoice # DFLL Clock Source
 
diff --git a/configs/saml21-xplained/include/board.h b/configs/saml21-xplained/include/board.h
index d9a2fdcc0c..727e83d83c 100644
--- a/configs/saml21-xplained/include/board.h
+++ b/configs/saml21-xplained/include/board.h
@@ -114,7 +114,7 @@
  */
 
 #undef BOARD_XOSC32K_ENABLE
-#ifdef CONFIG_SAM21_XPLAINED_XOSC32K
+#ifdef CONFIG_SAMD21_XPLAINED_XOSC32K
 #  define BOARD_XOSC32K_ENABLE       1
 #  define BOARD_XOSC32K_FREQUENCY    32768    /* 32.768KHz XTAL */
 #  define BOARD_XOSC32K_STARTUPTIME  OSC32KCTRL_XOSC32K_STARTUP_100MS
diff --git a/configs/saml21-xplained/nsh/defconfig b/configs/saml21-xplained/nsh/defconfig
index 0172755836..d0ea6e37cd 100644
--- a/configs/saml21-xplained/nsh/defconfig
+++ b/configs/saml21-xplained/nsh/defconfig
@@ -265,7 +265,7 @@ CONFIG_SAML21_XPLAINED_OSC16M_4MHZ=y
 # CONFIG_SAML21_XPLAINED_OSC16M_8MHZ is not set
 # CONFIG_SAML21_XPLAINED_OSC16M_12MHZ is not set
 # CONFIG_SAML21_XPLAINED_OSC16M_16MHZ is not set
-CONFIG_SAM21_XPLAINED_XOSC32K=y
+CONFIG_SAMD21_XPLAINED_XOSC32K=y
 CONFIG_SAML21_XPLAINED_DFLL=y
 # CONFIG_SAML21_XPLAINED_DFLL_OSC16MSRC is not set
 CONFIG_SAML21_XPLAINED_DFLL_XOSC32KSRC=y