diff --git a/modules/memfault-firmware-sdk/Kconfig b/modules/memfault-firmware-sdk/Kconfig
index 43b27ab56d67..d73afedc4f3a 100644
--- a/modules/memfault-firmware-sdk/Kconfig
+++ b/modules/memfault-firmware-sdk/Kconfig
@@ -13,9 +13,9 @@ config MEMFAULT_NCS_PROJECT_KEY
 
 choice
 	prompt "Choose built-in Memfault Device Info or custom implementation"
-	default MEMFAULT_DEVICE_INFO_BUILTIN
+	default MEMFAULT_NCS_DEVICE_INFO_BUILTIN
 
-config MEMFAULT_DEVICE_INFO_BUILTIN
+config MEMFAULT_NCS_DEVICE_INFO_BUILTIN
 	bool "Built-in Memfault Device Info implementation"
 	help
 	  Use built-in Memfault Device Info implementation
@@ -29,7 +29,7 @@ config MEMFAULT_NCS_DEVICE_INFO_CUSTOM
 
 endchoice
 
-if MEMFAULT_DEVICE_INFO_BUILTIN
+if MEMFAULT_NCS_DEVICE_INFO_BUILTIN
 
 choice
 	prompt "Memfault device ID generation method"
@@ -132,7 +132,7 @@ config MEMFAULT_NCS_FW_VERSION
 	 When using a statically configured firmware version, this value
 	 will be reported to Memfault
 
-endif  # MEMFAULT_DEVICE_INFO_BUILTIN
+endif  # MEMFAULT_NCS_DEVICE_INFO_BUILTIN
 
 config MEMFAULT_NCS_INIT_PRIORITY
 	int "Memfault initialization priority"
diff --git a/modules/memfault-firmware-sdk/memfault_integration.c b/modules/memfault-firmware-sdk/memfault_integration.c
index d789fe890b02..1a23f4985425 100644
--- a/modules/memfault-firmware-sdk/memfault_integration.c
+++ b/modules/memfault-firmware-sdk/memfault_integration.c
@@ -57,7 +57,7 @@ sMfltHttpClientConfig g_mflt_http_client_config = {
 	.api_key = CONFIG_MEMFAULT_NCS_PROJECT_KEY,
 };
 
-#if defined(CONFIG_MEMFAULT_DEVICE_INFO_BUILTIN)
+#if defined(CONFIG_MEMFAULT_NCS_DEVICE_INFO_BUILTIN)
 /* Firmware type check */
 BUILD_ASSERT(sizeof(CONFIG_MEMFAULT_NCS_FW_TYPE) > 1, "Firmware type must be configured");
 
@@ -132,7 +132,7 @@ int memfault_ncs_device_id_set(const char *device_id, size_t len)
 
 	return 0;
 }
-#endif /* defined(CONFIG_MEMFAULT_DEVICE_INFO_BUILTIN) */
+#endif /* defined(CONFIG_MEMFAULT_NCS_DEVICE_INFO_BUILTIN) */
 
 #if defined(CONFIG_MEMFAULT_NCS_DEVICE_ID_HW_ID)
 static int device_info_init(void)