diff --git a/Makefile.dep b/Makefile.dep
index b38bd61472be60e2a1f6b6f5845a9ca1de783d54..943e6f4fb5b197f62edb3fba113bbf9dc68aba5f 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -755,7 +755,7 @@ ifneq (,$(filter rdcli_simple_standalone,$(USEMODULE)))
 endif
 
 ifneq (,$(filter rdcli_simple,$(USEMODULE)))
-  USEMODULE += rdcli_common
+  USEMODULE += cord_common
   USEMODULE += fmt
 endif
 
@@ -765,7 +765,7 @@ ifneq (,$(filter rdcli_standalone,$(USEMODULE)))
 endif
 
 ifneq (,$(filter rdcli,$(USEMODULE)))
-  USEMODULE += rdcli_common
+  USEMODULE += cord_common
   USEMODULE += core_thread_flags
   USEMODULE += gcoap
   USEMODULE += fmt
@@ -774,7 +774,7 @@ ifneq (,$(filter rdcli,$(USEMODULE)))
   endif
 endif
 
-ifneq (,$(filter rdcli_common,$(USEMODULE)))
+ifneq (,$(filter cord_common,$(USEMODULE)))
   USEMODULE += fmt
   USEMODULE += gcoap
   USEMODULE += luid
diff --git a/examples/rdcli/main.c b/examples/rdcli/main.c
index f60f794a96fcd7eec2bc3628616258480b807dab..4d00e6d885b9a084b53eca14ff05998d1c1e7169 100644
--- a/examples/rdcli/main.c
+++ b/examples/rdcli/main.c
@@ -24,7 +24,7 @@
 #include "shell.h"
 #include "net/ipv6/addr.h"
 #include "net/gcoap.h"
-#include "net/rdcli_common.h"
+#include "net/cord/common.h"
 #include "net/rdcli_standalone.h"
 
 #define MAIN_QUEUE_SIZE     (8)
@@ -98,7 +98,7 @@ int main(void)
     rdcli_standalone_reg_cb(_on_rdcli_event);
 
     puts("Client information:");
-    printf("  ep: %s\n", rdcli_common_get_ep());
+    printf("  ep: %s\n", cord_common_get_ep());
     printf("  lt: %is\n", (int)RDCLI_LT);
 
     char line_buf[SHELL_DEFAULT_BUFSIZE];
diff --git a/examples/rdcli_simple/main.c b/examples/rdcli_simple/main.c
index 5931e64376ad65e83c350fdeda6a964361ae1bf4..24726dcd21025e3588335288325c5847e4dfec1c 100644
--- a/examples/rdcli_simple/main.c
+++ b/examples/rdcli_simple/main.c
@@ -23,7 +23,7 @@
 
 #include "shell.h"
 #include "net/gcoap.h"
-#include "net/rdcli_common.h"
+#include "net/cord/common.h"
 
 #define BUFSIZE             (64U)
 
@@ -68,7 +68,7 @@ int main(void)
 
     /* fill riot info */
     sprintf(riot_info, "{\"ep\":\"%s\",\"lt\":%u}",
-            rdcli_common_get_ep(), RDCLI_LT);
+            cord_common_get_ep(), RDCLI_LT);
 
     /* register resource handlers with gcoap */
     gcoap_register_listener(&listener);
@@ -77,7 +77,7 @@ int main(void)
     puts("RD client information:");
     printf(" RD addr: %s\n", RDCLI_SERVER_ADDR);
     printf(" RD port: %u\n", (unsigned)RDCLI_SERVER_PORT);
-    printf("      ep: %s\n", rdcli_common_get_ep());
+    printf("      ep: %s\n", cord_common_get_ep());
     printf("      lt: %is\n", (int)RDCLI_LT);
 
     /* run the shell */
diff --git a/sys/Makefile b/sys/Makefile
index 871f33f26c325af7352513d133ab0a0c0642ceb7..5cefa1c6e1c3f0250db793789bfe85627b4fccb9 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -127,7 +127,7 @@ endif
 ifneq (,$(filter skald,$(USEMODULE)))
   DIRS += net/skald
 endif
-ifneq (,$(filter rdcli_common,$(USEMODULE)))
+ifneq (,$(filter cord_common,$(USEMODULE)))
   DIRS += net/application_layer/cord/common
 endif
 ifneq (,$(filter rdcli_simple,$(USEMODULE)))
diff --git a/sys/auto_init/auto_init.c b/sys/auto_init/auto_init.c
index fd8398807ba0b004f0ba9427ab9c58894b63f7ac..ed815aa8ba733eece2578b735a3444f0a8df546d 100644
--- a/sys/auto_init/auto_init.c
+++ b/sys/auto_init/auto_init.c
@@ -158,10 +158,10 @@ void auto_init(void)
     DEBUG("Auto init Skald\n");
     skald_init();
 #endif
-#ifdef MODULE_RDCLI_COMMON
-    DEBUG("Auto init rdcli_common module\n");
-    extern void rdcli_common_init(void);
-    rdcli_common_init();
+#ifdef MODULE_CORD_COMMON
+    DEBUG("Auto init cord_common module\n");
+    extern void cord_common_init(void);
+    cord_common_init();
 #endif
 #ifdef MODULE_RDCLI_STANDALONE
     DEBUG("Auto init rdcli_standalone\n");
diff --git a/sys/include/net/rdcli_common.h b/sys/include/net/cord/common.h
similarity index 53%
rename from sys/include/net/rdcli_common.h
rename to sys/include/net/cord/common.h
index e3654f70fd10d2a76f3550939453903042e8c25a..ee5864f5f41253713876a5e6d70dd73ca432692c 100644
--- a/sys/include/net/rdcli_common.h
+++ b/sys/include/net/cord/common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Freie Universität Berlin
+ * Copyright (C) 2017,2018 Freie Universität Berlin
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -7,19 +7,19 @@
  */
 
 /**
- * @defgroup    net_rdcli_common CoRE RD Client Common
- * @ingroup     net
- * @brief       Shared functionality for CoRE Resource Directory clients
+ * @defgroup    net_cord_common CoRE RD Common
+ * @ingroup     net_cord
+ * @brief       Shared functionality for CoRE Resource Directory endpoints
  * @{
  *
  * @file
- * @brief       Shared CoRE RD client functions
+ * @brief       Shared CoRE RD endpoint functions
  *
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef NET_RDCLI_COMMON_H
-#define NET_RDCLI_COMMON_H
+#ifndef NET_CORD_COMMON_H
+#define NET_CORD_COMMON_H
 
 #include "net/rdcli_config.h"
 
@@ -30,39 +30,39 @@ extern "C" {
 /**
  * @brief   Export the local endpoint identifier
  *
- * @note    Use rdcli_common_get_ep() for accessing the endpoint identifier
+ * @note    Use cord_common_get_ep() for accessing the endpoint identifier
  */
-extern char rdcli_ep[];
+extern char cord_common_ep[];
 
 /**
  * @brief   Generate unique endpoint identifier (ep)
  */
-void rdcli_common_init(void);
+void cord_common_init(void);
 
 /**
  * @brief   Get the local endpoint identifier
  */
-static inline const char *rdcli_common_get_ep(void)
+static inline const char *cord_common_get_ep(void)
 {
-    return (const char *)rdcli_ep;
+    return (const char *)cord_common_ep;
 }
 
 /**
  * @brief   Add selected query string options to a gcoap request
  *
  * This function adds:
- *  - `ep` -> as extracted by rdcli_commont_get_ep()
- *  - [optional] `lt` -> if defined by RDCLI_LT
- *  - [optional] 'd'  -> if defined by RDCLI_D
+ *  - `ep` -> as extracted by cord_common_get_ep()
+ *  - [optional] `lt` -> if defined by CORD_LT
+ *  - [optional] 'd'  -> if defined by CORD_D
  *
  *  @return  0 on success
  *  @return  <0 on error
  */
-int rdcli_common_add_qstring(coap_pkt_t *pkt);
+int cord_common_add_qstring(coap_pkt_t *pkt);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* NET_RDCLI_COMMON_H */
+#endif /* NET_CORD_COMMON_H */
 /** @} */
diff --git a/sys/net/application_layer/cord/common/Makefile b/sys/net/application_layer/cord/common/Makefile
index 6ac70df22bc47889895649c249a9fd9ca12427e0..2f0ff3a63cfb888a313253af834472b8e846b2e4 100644
--- a/sys/net/application_layer/cord/common/Makefile
+++ b/sys/net/application_layer/cord/common/Makefile
@@ -1,3 +1,3 @@
-MODULE = rdcli_common
+MODULE = cord_common
 
 include $(RIOTBASE)/Makefile.base
diff --git a/sys/net/application_layer/cord/common/rdcli_common.c b/sys/net/application_layer/cord/common/cord_common.c
similarity index 75%
rename from sys/net/application_layer/cord/common/rdcli_common.c
rename to sys/net/application_layer/cord/common/cord_common.c
index 1e8f210f46b76b80cedc936bafe2819609c6b4cc..85fc893e03d6a259007c5e49e5c9dbb163b14848 100644
--- a/sys/net/application_layer/cord/common/rdcli_common.c
+++ b/sys/net/application_layer/cord/common/cord_common.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     net_rdcli_common
+ * @ingroup     net_cord_common
  * @{
  *
  * @file
@@ -22,7 +22,7 @@
 #include "luid.h"
 
 #include "net/gcoap.h"
-#include "net/rdcli_common.h"
+#include "net/cord/common.h"
 
 #define ENABLE_DEBUG (0)
 #include "debug.h"
@@ -35,29 +35,29 @@
 #define BUFSIZE         (PREFIX_LEN + RDCLI_EP_SUFFIX_LEN)
 #endif
 
-char rdcli_ep[BUFSIZE];
+char cord_common_ep[BUFSIZE];
 
-void rdcli_common_init(void)
+void cord_common_init(void)
 {
 #ifdef RDCLI_EP
-    memcpy(rdcli_ep, RDCLI_EP, BUFSIZE);
+    memcpy(cord_common_ep, RDCLI_EP, BUFSIZE);
 #else
     uint8_t luid[RDCLI_EP_SUFFIX_LEN / 2];
 
     if (PREFIX_LEN > 1) {
-        memcpy(rdcli_ep, RDCLI_EP_PREFIX, (PREFIX_LEN - 1));
+        memcpy(cord_common_ep, RDCLI_EP_PREFIX, (PREFIX_LEN - 1));
     }
 
     luid_get(luid, sizeof(luid));
-    fmt_bytes_hex(&rdcli_ep[PREFIX_LEN - 1], luid, sizeof(luid));
-    rdcli_ep[BUFSIZE - 1] = '\0';
+    fmt_bytes_hex(&cord_common_ep[PREFIX_LEN - 1], luid, sizeof(luid));
+    cord_common_ep[BUFSIZE - 1] = '\0';
 #endif
 }
 
-int rdcli_common_add_qstring(coap_pkt_t *pkt)
+int cord_common_add_qstring(coap_pkt_t *pkt)
 {
     /* extend the url with some query string options */
-    int res = gcoap_add_qstring(pkt, "ep", rdcli_ep);
+    int res = gcoap_add_qstring(pkt, "ep", cord_common_ep);
     if (res < 0) {
         return res;
     }
diff --git a/sys/net/application_layer/cord/ep/rdcli.c b/sys/net/application_layer/cord/ep/rdcli.c
index 0742ebcc1c7e56d02a500f78830e920060a1fb8e..dbbbd1e3e43618d766d42bc7c6acf79259a38da6 100644
--- a/sys/net/application_layer/cord/ep/rdcli.c
+++ b/sys/net/application_layer/cord/ep/rdcli.c
@@ -27,7 +27,7 @@
 #include "net/gcoap.h"
 #include "net/ipv6/addr.h"
 #include "net/rdcli.h"
-#include "net/rdcli_common.h"
+#include "net/cord/common.h"
 #include "net/rdcli_config.h"
 
 #ifdef MODULE_RDCLI_STANDALONE
@@ -273,7 +273,7 @@ int rdcli_register(const sock_udp_ep_t *remote, const char *regif)
     }
     /* set some packet options and write query string */
     coap_hdr_set_type(pkt.hdr, COAP_TYPE_CON);
-    rdcli_common_add_qstring(&pkt);
+    cord_common_add_qstring(&pkt);
 
     /* add the resource description as payload */
     res = gcoap_get_resource_list(pkt.payload, pkt.payload_len,
@@ -355,7 +355,7 @@ void rdcli_dump_status(void)
         ipv6_addr_to_str(addr, (ipv6_addr_t *)&_rd_remote.addr, sizeof(addr));
 
         printf("RD address: coap://[%s]:%i\n", addr, (int)_rd_remote.port);
-        printf("   ep name: %s\n", rdcli_common_get_ep());
+        printf("   ep name: %s\n", cord_common_get_ep());
         printf("  lifetime: %is\n", (int)RDCLI_LT);
         printf("    reg if: %s\n", _rd_regif);
         printf("  location: %s\n", _rd_loc);
diff --git a/sys/net/application_layer/cord/epsim/rdcli_simple.c b/sys/net/application_layer/cord/epsim/rdcli_simple.c
index 20edc90ceb7879a60bb04a539452375f3e91e219..3da1cffeb9765fc01d21629e989ab560990ad7a0 100644
--- a/sys/net/application_layer/cord/epsim/rdcli_simple.c
+++ b/sys/net/application_layer/cord/epsim/rdcli_simple.c
@@ -23,7 +23,7 @@
 #include "fmt.h"
 #include "net/gcoap.h"
 #include "net/rdcli_config.h"
-#include "net/rdcli_common.h"
+#include "net/cord/common.h"
 #include "net/rdcli_simple.h"
 #include "net/ipv6/addr.h"
 
@@ -56,7 +56,7 @@ int rdcli_simple_register(void)
     /* make packet confirmable */
     coap_hdr_set_type(pkt.hdr, COAP_TYPE_CON);
     /* add Uri-Query options */
-    if (rdcli_common_add_qstring(&pkt) < 0) {
+    if (cord_common_add_qstring(&pkt) < 0) {
         return RDCLI_SIMPLE_ERROR;
     }
     /* finish, we don't have any payload */
diff --git a/sys/shell/commands/sc_rdcli.c b/sys/shell/commands/sc_rdcli.c
index c67b79016dfcb253b883cb1824981d6bbb563d56..5a44aaf17d3deea1cf68569f3c5c3d0ff6ed3358 100644
--- a/sys/shell/commands/sc_rdcli.c
+++ b/sys/shell/commands/sc_rdcli.c
@@ -25,7 +25,6 @@
 #include "net/nanocoap.h"
 #include "net/sock/util.h"
 #include "net/rdcli_config.h"
-#include "net/rdcli_common.h"
 
 static int make_sock_ep(sock_udp_ep_t *ep, const char *addr)
 {