diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76d8466b8d..ff12e0852e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -581,12 +581,14 @@ foreach(module_name ${ZEPHYR_MODULE_NAMES})
   # https://cmake.org/pipermail/cmake/2019-June/069547.html
   zephyr_string(SANITIZE TOUPPER MODULE_NAME_UPPER ${module_name})
   if(NOT ${ZEPHYR_${MODULE_NAME_UPPER}_CMAKE_DIR} STREQUAL "")
+    set(ZEPHYR_CURRENT_MODULE_NAME ${ZEPHYR_${MODULE_NAME_UPPER}_MODULE_NAME})
     set(ZEPHYR_CURRENT_MODULE_DIR ${ZEPHYR_${MODULE_NAME_UPPER}_MODULE_DIR})
     set(ZEPHYR_CURRENT_CMAKE_DIR ${ZEPHYR_${MODULE_NAME_UPPER}_CMAKE_DIR})
     add_subdirectory(${ZEPHYR_CURRENT_CMAKE_DIR} ${CMAKE_BINARY_DIR}/modules/${module_name})
   endif()
 endforeach()
-# Done processing modules, clear ZEPHYR_CURRENT_MODULE_DIR and ZEPHYR_CURRENT_CMAKE_DIR.
+# Done processing modules, clear module variables
+set(ZEPHYR_CURRENT_MODULE_NAME)
 set(ZEPHYR_CURRENT_MODULE_DIR)
 set(ZEPHYR_CURRENT_CMAKE_DIR)
 
diff --git a/cmake/modules/zephyr_module.cmake b/cmake/modules/zephyr_module.cmake
index 50ee05dfe2..191c71c193 100644
--- a/cmake/modules/zephyr_module.cmake
+++ b/cmake/modules/zephyr_module.cmake
@@ -137,6 +137,7 @@ if(WEST OR ZEPHYR_MODULES)
 
     zephyr_string(SANITIZE TOUPPER MODULE_NAME_UPPER ${module_name})
     if(NOT ${MODULE_NAME_UPPER} STREQUAL CURRENT)
+      set(ZEPHYR_${MODULE_NAME_UPPER}_MODULE_NAME ${module_name})
       set(ZEPHYR_${MODULE_NAME_UPPER}_MODULE_DIR ${module_path})
       set(ZEPHYR_${MODULE_NAME_UPPER}_CMAKE_DIR ${cmake_path})
     else()