diff --git a/sys/Makefile b/sys/Makefile
index 6e431596f7f756cab98590caf627e5b4d2ce5f6b..741f1d373040044367333b7c3dcdae82aa4f2cef 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -101,7 +101,7 @@ ifneq (,$(filter sema,$(USEMODULE)))
     DIRS += sema
 endif
 ifneq (,$(filter gcoap,$(USEMODULE)))
-    DIRS += net/application_layer/coap
+    DIRS += net/application_layer/gcoap
 endif
 ifneq (,$(filter emcute,$(USEMODULE)))
     DIRS += net/application_layer/emcute
diff --git a/sys/net/application_layer/coap/Makefile b/sys/net/application_layer/gcoap/Makefile
similarity index 100%
rename from sys/net/application_layer/coap/Makefile
rename to sys/net/application_layer/gcoap/Makefile
diff --git a/sys/net/application_layer/coap/gcoap.c b/sys/net/application_layer/gcoap/gcoap.c
similarity index 100%
rename from sys/net/application_layer/coap/gcoap.c
rename to sys/net/application_layer/gcoap/gcoap.c