diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84844e700..3ebffdd94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,6 @@ add_subdirectory(logging)
 add_subdirectory(lte)
 add_subdirectory(math)
 add_subdirectory(mlearning)
-add_subdirectory(modbus)
 add_subdirectory(netutils)
 add_subdirectory(nshlib)
 add_subdirectory(platform)
diff --git a/industry/modbus/Make.defs b/industry/modbus/Make.defs
index fde0dd716..b358e9be4 100644
--- a/industry/modbus/Make.defs
+++ b/industry/modbus/Make.defs
@@ -20,4 +20,4 @@
 #
 ############################################################################
 
-include $(wildcard $(APPDIR)/modbus/*/Make.defs)
+include $(wildcard $(APPDIR)/industry/modbus/*/Make.defs)
diff --git a/industry/modbus/freemodbus/Kconfig b/industry/modbus/freemodbus/Kconfig
index dd46bbe3c..7c9e834f3 100644
--- a/industry/modbus/freemodbus/Kconfig
+++ b/industry/modbus/freemodbus/Kconfig
@@ -153,17 +153,17 @@ config INDUSTRY_MODBUS_MASTER
 config MB_ASCII_MASTER
 	bool "Modbus ASCII master"
 	default n
-	depends on MODBUS_MASTER
+	depends on INDUSTRY_MODBUS_MASTER
 
 config MB_RTU_MASTER
 	bool "Modbus RTU master"
 	default n
-	depends on MODBUS_MASTER
+	depends on INDUSTRY_MODBUS_MASTER
 
 config MB_PORT_HAS_CLOSE
 	bool "Platform close callbacks"
 	default n
-	depends on MODBUS_MASTER
+	depends on INDUSTRY_MODBUS_MASTER
 	---help---
 		A port which wants to get an callback must select
 		CONFIG_MB_HAS_CLOSE and provide vMBMasterPortClose() as
@@ -250,7 +250,7 @@ config MB_MASTER_FUNC_READWRITE_HOLDING_ENABLED
 		If the Read/Write Multiple Registers function should be enabled.
 
 endif # MB_ASCII_MASTER || MB_RTU_MASTER
-endif # MODBUS
+endif # INDUSTRY_MODBUS
 
 config INDUSTRY_MODBUS_DISABLE_LOG
 	bool "Disable logging for FreeModBus"
diff --git a/industry/modbus/freemodbus/ascii/mbascii.c b/industry/modbus/freemodbus/ascii/mbascii.c
index d64505125..1ba55f99c 100644
--- a/industry/modbus/freemodbus/ascii/mbascii.c
+++ b/industry/modbus/freemodbus/ascii/mbascii.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/industry/modbus/ascii/mbascii.c
+ * apps/industry/modbus/freemodbus/ascii/mbascii.c
  *
  * SPDX-License-Identifier: BSD-3-Clause
  * SPDX-FileCopyrightText: 2006 Christian Walter <wolti@sil.at>