diff --git a/Makefile.dep b/Makefile.dep
index de8da13ac3..b3f0f1ca11 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -14,8 +14,8 @@ ifneq (,$(findstring uart0,$(USEMODULE)))
 endif
 
 ifneq (,$(findstring cc110x,$(USEMODULE)))
-	ifeq (,$(findstring protocol-multiplex,$(USEMODULE)))
-		USEMODULE += protocol-multiplex
+	ifeq (,$(findstring protocol_multiplex,$(USEMODULE)))
+		USEMODULE += protocol_multiplex
 	endif
 endif
 
diff --git a/sys/Makefile b/sys/Makefile
index 000c30dc61..6c82267cd2 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -70,7 +70,7 @@ endif
 ifneq (,$(findstring net_help,$(USEMODULE)))
     DIRS += net/net_help
 endif
-ifneq (,$(findstring protocol-multiplex,$(USEMODULE)))
+ifneq (,$(findstring protocol_multiplex,$(USEMODULE)))
     DIRS += net/protocol-multiplex
 endif
 ifneq (,$(findstring sixlowpan,$(USEMODULE)))
diff --git a/sys/net/protocol-multiplex/Makefile b/sys/net/protocol-multiplex/Makefile
index 93dfabd905..e5c5cb1248 100644
--- a/sys/net/protocol-multiplex/Makefile
+++ b/sys/net/protocol-multiplex/Makefile
@@ -1,4 +1,4 @@
-MODULE:=$(shell basename $(CURDIR))
+MODULE:=protocol_multiplex
 INCLUDES = -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include
 
 include $(RIOTBASE)/Makefile.base