diff --git a/batman-adv/Config.in b/batman-adv/Config.in
index 687acf0..52a688b 100644
--- a/batman-adv/Config.in
+++ b/batman-adv/Config.in
@@ -19,7 +19,7 @@
 # B.A.T.M.A.N meshing protocol
 #
 
-config KMOD_BATMAN_ADV_BATMAN_V
+config BATMAN_ADV_BATMAN_V
 	bool "B.A.T.M.A.N. V protocol"
 	depends on PACKAGE_kmod-batman-adv
 	default y
@@ -33,7 +33,7 @@ config KMOD_BATMAN_ADV_BATMAN_V
 	  B.A.T.M.A.N. V is currently considered experimental and not
 	  compatible to B.A.T.M.A.N. IV networks.
 
-config KMOD_BATMAN_ADV_BLA
+config BATMAN_ADV_BLA
 	bool "Bridge Loop Avoidance"
 	depends on PACKAGE_kmod-batman-adv
 	select PACKAGE_kmod-lib-crc16
@@ -45,7 +45,7 @@ config KMOD_BATMAN_ADV_BLA
 	  more than one mesh node in the same LAN, you can safely remove
 	  this feature and save some space.
 
-config KMOD_BATMAN_ADV_DAT
+config BATMAN_ADV_DAT
 	bool "Distributed ARP Table"
 	depends on PACKAGE_kmod-batman-adv
 	default y
@@ -55,7 +55,7 @@ config KMOD_BATMAN_ADV_DAT
 	  mesh networks. If you think that your network does not need
 	  this option you can safely remove it and save some space.
 
-config KMOD_BATMAN_ADV_NC
+config BATMAN_ADV_NC
 	bool "Network Coding"
 	depends on PACKAGE_kmod-batman-adv
 	help
@@ -68,7 +68,7 @@ config KMOD_BATMAN_ADV_NC
 	  If you think that your network does not need this feature you
 	  can safely disable it and save some space.
 
-config KMOD_BATMAN_ADV_MCAST
+config BATMAN_ADV_MCAST
 	bool "Multicast optimisation"
 	depends on PACKAGE_kmod-batman-adv
 	help
@@ -76,7 +76,7 @@ config KMOD_BATMAN_ADV_MCAST
 	  reduce the air overhead while improving the reliability of
 	  multicast messages.
 
-config KMOD_BATMAN_ADV_DEBUGFS
+config BATMAN_ADV_DEBUGFS
 	bool "batman-adv debugfs entries"
 	depends on PACKAGE_kmod-batman-adv
 	select KERNEL_DEBUG_FS
@@ -87,9 +87,9 @@ config KMOD_BATMAN_ADV_DEBUGFS
 
 	  If unsure, say N.
 
-config KMOD_BATMAN_ADV_DEBUG_LOG
+config BATMAN_ADV_DEBUG
 	bool "B.A.T.M.A.N. debugging"
-	depends on KMOD_BATMAN_ADV_DEBUGFS
+	depends on BATMAN_ADV_DEBUGFS
 	help
 	  This is an option for use by developers; most people should
 	  say N here. This enables compilation of support for
diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 047b2d7..3075b52 100644
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -52,13 +52,13 @@ endef
 
 PKG_EXTRA_KCONFIG:= \
 	CONFIG_BATMAN_ADV=m \
-	CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG),y,n) \
-	CONFIG_BATMAN_ADV_DEBUGFS=$(if $(CONFIG_KMOD_BATMAN_ADV_DEBUGFS),y,n) \
-	CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_KMOD_BATMAN_ADV_BLA),y,n) \
-	CONFIG_BATMAN_ADV_DAT=$(if $(CONFIG_KMOD_BATMAN_ADV_DAT),y,n) \
-	CONFIG_BATMAN_ADV_MCAST=$(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),y,n) \
-	CONFIG_BATMAN_ADV_NC=$(if $(CONFIG_KMOD_BATMAN_ADV_NC),y,n) \
-	CONFIG_BATMAN_ADV_BATMAN_V=$(if $(CONFIG_KMOD_BATMAN_ADV_BATMAN_V),y,n) \
+	CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_BATMAN_ADV_DEBUG),y,n) \
+	CONFIG_BATMAN_ADV_DEBUGFS=$(if $(CONFIG_BATMAN_ADV_DEBUGFS),y,n) \
+	CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_BATMAN_ADV_BLA),y,n) \
+	CONFIG_BATMAN_ADV_DAT=$(if $(CONFIG_BATMAN_ADV_DAT),y,n) \
+	CONFIG_BATMAN_ADV_MCAST=$(if $(CONFIG_BATMAN_ADV_MCAST),y,n) \
+	CONFIG_BATMAN_ADV_NC=$(if $(CONFIG_BATMAN_ADV_NC),y,n) \
+	CONFIG_BATMAN_ADV_BATMAN_V=$(if $(CONFIG_BATMAN_ADV_BATMAN_V),y,n) \
 
 PKG_EXTRA_CFLAGS:= \
 	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \
@@ -76,9 +76,9 @@ NOSTDINC_FLAGS = \
 	-DBATADV_SOURCE_VERSION=\\\"openwrt-$(PKG_VERSION)-$(PKG_RELEASE)\\\"
 
 COMPAT_SOURCES = \
-	$(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),../../compat-sources/net/core/skbuff.o,) \
-	$(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),../../compat-sources/net/ipv4/igmp.o,) \
-	$(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),../../compat-sources/net/ipv6/mcast_snoop.o,) \
+	$(if $(CONFIG_BATMAN_ADV_MCAST),../../compat-sources/net/core/skbuff.o,) \
+	$(if $(CONFIG_BATMAN_ADV_MCAST),../../compat-sources/net/ipv4/igmp.o,) \
+	$(if $(CONFIG_BATMAN_ADV_MCAST),../../compat-sources/net/ipv6/mcast_snoop.o,) \
 
 define Build/Compile
 	+env "batman-adv-y=$(COMPAT_SOURCES)" \