diff --git a/CMakeLists.txt b/CMakeLists.txt
index 084723a9d..2ec4ef6e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,8 +37,8 @@ option(HAVE_LOGGING "logging enabled by default" ON)
 option(HAVE_STATS "stats enabled by default" ON)
 
 option(TARGET_PINGSERVER "build pingserver binary" ON)
-option(TARGET_DS "build dataserver binary" ON)
-option(TARGET_SLIMDS "build slim dataserver binary" ON)
+option(TARGET_RDS "build rich data server binary" ON)
+option(TARGET_SLIMRDS "build slim rich data server binary" ON)
 option(TARGET_SLIMCACHE "build slimcache binary" ON)
 option(TARGET_TWEMCACHE "build twemcache binary" ON)
 option(TARGET_CDB "build cdb binary (implies HAVE_RUST)" OFF)
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 08b694b69..15dc57dd0 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -2,12 +2,12 @@ if(TARGET_PINGSERVER)
     add_subdirectory(pingserver)
 endif()
 
-if(TARGET_DS)
-    add_subdirectory(ds)
+if(TARGET_RDS)
+    add_subdirectory(rds)
 endif()
 
-if(TARGET_SLIMDS)
-    add_subdirectory(slimds)
+if(TARGET_SLIMRDS)
+    add_subdirectory(slimrds)
 endif()
 
 if(TARGET_SLIMCACHE)
diff --git a/src/server/ds/README b/src/server/ds/README
deleted file mode 100644
index e2f03ee56..000000000
--- a/src/server/ds/README
+++ /dev/null
@@ -1,2 +0,0 @@
-We will probably rename "ds", which stands for "dataserver" right now, once
-we come up with a proper name for the protocol we are using in this binary.
diff --git a/src/server/ds/CMakeLists.txt b/src/server/rds/CMakeLists.txt
similarity index 93%
rename from src/server/ds/CMakeLists.txt
rename to src/server/rds/CMakeLists.txt
index 8ae123622..9f23843a1 100644
--- a/src/server/ds/CMakeLists.txt
+++ b/src/server/rds/CMakeLists.txt
@@ -22,7 +22,7 @@ set(LIBS
     ${CMAKE_THREAD_LIBS_INIT})
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/_bin)
-set(TARGET_NAME ${PROJECT_NAME}_ds)
+set(TARGET_NAME ${PROJECT_NAME}_rds)
 
 add_executable(${TARGET_NAME} ${SOURCE})
 target_link_libraries(${TARGET_NAME} ${MODULES} ${LIBS})
diff --git a/src/server/rds/README b/src/server/rds/README
new file mode 100644
index 000000000..07835ecac
--- /dev/null
+++ b/src/server/rds/README
@@ -0,0 +1,2 @@
+We may want to rename "rds", which stands for "rich data server" right now, once
+we come up with a proper name for the protocol we are using in this binary.
diff --git a/src/server/ds/admin/CMakeLists.txt b/src/server/rds/admin/CMakeLists.txt
similarity index 100%
rename from src/server/ds/admin/CMakeLists.txt
rename to src/server/rds/admin/CMakeLists.txt
diff --git a/src/server/ds/admin/process.c b/src/server/rds/admin/process.c
similarity index 83%
rename from src/server/ds/admin/process.c
rename to src/server/rds/admin/process.c
index cc53904f9..f843dc3b9 100644
--- a/src/server/ds/admin/process.c
+++ b/src/server/rds/admin/process.c
@@ -6,7 +6,7 @@
 #include <cc_mm.h>
 #include <cc_print.h>
 
-#define DS_ADMIN_MODULE_NAME "ds::admin"
+#define RDS_ADMIN_MODULE_NAME "rds::admin"
 
 extern struct stats stats;
 extern unsigned int nmetric;
@@ -18,10 +18,10 @@ static size_t cap;
 void
 admin_process_setup(void)
 {
-    log_info("set up the %s module", DS_ADMIN_MODULE_NAME);
+    log_info("set up the %s module", RDS_ADMIN_MODULE_NAME);
     if (admin_init) {
         log_warn("%s has already been setup, overwrite",
-                 DS_ADMIN_MODULE_NAME);
+                 RDS_ADMIN_MODULE_NAME);
     }
 
     cap = nmetric * METRIC_PRINT_LEN;
@@ -34,9 +34,9 @@ admin_process_setup(void)
 void
 admin_process_teardown(void)
 {
-    log_info("tear down the %s module", DS_ADMIN_MODULE_NAME);
+    log_info("tear down the %s module", RDS_ADMIN_MODULE_NAME);
     if (!admin_init) {
-        log_warn("%s has never been setup", DS_ADMIN_MODULE_NAME);
+        log_warn("%s has never been setup", RDS_ADMIN_MODULE_NAME);
     }
 
     admin_init = false;
diff --git a/src/server/ds/admin/process.h b/src/server/rds/admin/process.h
similarity index 100%
rename from src/server/ds/admin/process.h
rename to src/server/rds/admin/process.h
diff --git a/src/server/ds/data/CMakeLists.txt b/src/server/rds/data/CMakeLists.txt
similarity index 100%
rename from src/server/ds/data/CMakeLists.txt
rename to src/server/rds/data/CMakeLists.txt
diff --git a/src/server/ds/data/cmd_list.c b/src/server/rds/data/cmd_list.c
similarity index 100%
rename from src/server/ds/data/cmd_list.c
rename to src/server/rds/data/cmd_list.c
diff --git a/src/server/ds/data/cmd_list.h b/src/server/rds/data/cmd_list.h
similarity index 100%
rename from src/server/ds/data/cmd_list.h
rename to src/server/rds/data/cmd_list.h
diff --git a/src/server/ds/data/cmd_misc.c b/src/server/rds/data/cmd_misc.c
similarity index 100%
rename from src/server/ds/data/cmd_misc.c
rename to src/server/rds/data/cmd_misc.c
diff --git a/src/server/ds/data/cmd_misc.h b/src/server/rds/data/cmd_misc.h
similarity index 100%
rename from src/server/ds/data/cmd_misc.h
rename to src/server/rds/data/cmd_misc.h
diff --git a/src/server/ds/data/cmd_sarray.c b/src/server/rds/data/cmd_sarray.c
similarity index 100%
rename from src/server/ds/data/cmd_sarray.c
rename to src/server/rds/data/cmd_sarray.c
diff --git a/src/server/ds/data/cmd_sarray.h b/src/server/rds/data/cmd_sarray.h
similarity index 100%
rename from src/server/ds/data/cmd_sarray.h
rename to src/server/rds/data/cmd_sarray.h
diff --git a/src/server/ds/data/process.c b/src/server/rds/data/process.c
similarity index 91%
rename from src/server/ds/data/process.c
rename to src/server/rds/data/process.c
index 14ccdc330..2edb020df 100644
--- a/src/server/ds/data/process.c
+++ b/src/server/rds/data/process.c
@@ -6,7 +6,7 @@
 #include <cc_debug.h>
 #include <cc_print.h>
 
-#define DS_PROCESS_MODULE_NAME "ds::process"
+#define RDS_PROCESS_MODULE_NAME "rds::process"
 
 #define OVERSIZE_ERR_MSG    "oversized value, cannot be stored"
 #define OOM_ERR_MSG         "server is out of memory"
@@ -24,11 +24,11 @@ process_metrics_st *process_metrics = NULL;
 void
 process_setup(process_options_st *options, process_metrics_st *metrics)
 {
-    log_info("set up the %s module", DS_PROCESS_MODULE_NAME);
+    log_info("set up the %s module", RDS_PROCESS_MODULE_NAME);
 
     if (process_init) {
         log_warn("%s has already been setup, overwrite",
-                 DS_PROCESS_MODULE_NAME);
+                 RDS_PROCESS_MODULE_NAME);
     }
 
     process_metrics = metrics;
@@ -63,9 +63,9 @@ process_setup(process_options_st *options, process_metrics_st *metrics)
 void
 process_teardown(void)
 {
-    log_info("tear down the %s module", DS_PROCESS_MODULE_NAME);
+    log_info("tear down the %s module", RDS_PROCESS_MODULE_NAME);
     if (!process_init) {
-        log_warn("%s has never been setup", DS_PROCESS_MODULE_NAME);
+        log_warn("%s has never been setup", RDS_PROCESS_MODULE_NAME);
     }
 
     command_registry[REQ_PING] = cmd_ping;
@@ -102,7 +102,7 @@ process_request(struct response *rsp, struct request *req)
 }
 
 int
-ds_process_read(struct buf **rbuf, struct buf **wbuf, void **data)
+rds_process_read(struct buf **rbuf, struct buf **wbuf, void **data)
 {
     parse_rstatus_e status;
     struct request *req; /* data should be NULL or hold a req pointer */
@@ -178,7 +178,7 @@ ds_process_read(struct buf **rbuf, struct buf **wbuf, void **data)
 
 
 int
-ds_process_write(struct buf **rbuf, struct buf **wbuf, void **data)
+rds_process_write(struct buf **rbuf, struct buf **wbuf, void **data)
 {
     log_verb("post-write processing");
 
@@ -192,7 +192,7 @@ ds_process_write(struct buf **rbuf, struct buf **wbuf, void **data)
 
 
 int
-ds_process_error(struct buf **rbuf, struct buf **wbuf, void **data)
+rds_process_error(struct buf **rbuf, struct buf **wbuf, void **data)
 {
     log_verb("post-error processing");
 
diff --git a/src/server/ds/data/process.h b/src/server/rds/data/process.h
similarity index 86%
rename from src/server/ds/data/process.h
rename to src/server/rds/data/process.h
index 1f484418d..1de1c3af4 100644
--- a/src/server/ds/data/process.h
+++ b/src/server/rds/data/process.h
@@ -38,6 +38,6 @@ extern bool allow_flush;
 void process_setup(process_options_st *options, process_metrics_st *metrics);
 void process_teardown(void);
 
-int ds_process_read(struct buf **rbuf, struct buf **wbuf, void **data);
-int ds_process_write(struct buf **rbuf, struct buf **wbuf, void **data);
-int ds_process_error(struct buf **rbuf, struct buf **wbuf, void **data);
+int rds_process_read(struct buf **rbuf, struct buf **wbuf, void **data);
+int rds_process_write(struct buf **rbuf, struct buf **wbuf, void **data);
+int rds_process_error(struct buf **rbuf, struct buf **wbuf, void **data);
diff --git a/src/server/ds/data/shared.h b/src/server/rds/data/shared.h
similarity index 100%
rename from src/server/ds/data/shared.h
rename to src/server/rds/data/shared.h
diff --git a/src/server/ds/main.c b/src/server/rds/main.c
similarity index 93%
rename from src/server/ds/main.c
rename to src/server/rds/main.c
index ada1a0594..888a64a4b 100644
--- a/src/server/ds/main.c
+++ b/src/server/rds/main.c
@@ -14,9 +14,9 @@
 #include <sysexits.h>
 
 struct data_processor worker_processor = {
-    ds_process_read,
-    ds_process_write,
-    ds_process_error,
+    rds_process_read,
+    rds_process_write,
+    rds_process_error,
 };
 
 static void
@@ -24,11 +24,11 @@ show_usage(void)
 {
     log_stdout(
             "Usage:" CRLF
-            "  pelikan_ds [option|config]" CRLF
+            "  pelikan_rds [option|config]" CRLF
             );
     log_stdout(
             "Description:" CRLF
-            "  pelikan_ds is one of the unified cache backends. " CRLF
+            "  pelikan_rds is one of the unified cache backends. " CRLF
             "  It uses slab-based storage for various data types. " CRLF
             "  It speaks the RESP protocol." CRLF
             );
@@ -41,7 +41,7 @@ show_usage(void)
             );
     log_stdout(
             "Example:" CRLF
-            "  pelikan_ds ds.conf" CRLF CRLF
+            "  pelikan_rds rds.conf" CRLF CRLF
             "Sample config files can be found under the config dir." CRLF
             );
 }
@@ -92,10 +92,10 @@ setup(void)
     }
 
     /* setup top-level application options */
-    if (option_bool(&setting.ds.daemonize)) {
+    if (option_bool(&setting.rds.daemonize)) {
         daemonize();
     }
-    fname = option_str(&setting.ds.pid_filename);
+    fname = option_str(&setting.rds.pid_filename);
     if (fname != NULL) {
         /* to get the correct pid, call create_pidfile after daemonize */
         create_pidfile(fname);
@@ -124,7 +124,7 @@ setup(void)
     core_worker_setup(&setting.worker, &stats.worker);
 
     /* adding recurring events to maintenance/admin thread */
-    intvl = option_uint(&setting.ds.dlog_intvl);
+    intvl = option_uint(&setting.rds.dlog_intvl);
     if (core_admin_register(intvl, debug_log_flush, NULL) == NULL) {
         log_stderr("Could not register timed event to flush debug log");
         goto error;
diff --git a/src/server/ds/setting.c b/src/server/rds/setting.c
similarity index 94%
rename from src/server/ds/setting.c
rename to src/server/rds/setting.c
index 1ef57d1e9..a91378260 100644
--- a/src/server/ds/setting.c
+++ b/src/server/rds/setting.c
@@ -1,7 +1,7 @@
 #include "setting.h"
 
 struct setting setting = {
-    { DS_OPTION(OPTION_INIT)        },
+    { RDS_OPTION(OPTION_INIT)       },
     { ADMIN_OPTION(OPTION_INIT)     },
     { SERVER_OPTION(OPTION_INIT)    },
     { WORKER_OPTION(OPTION_INIT)    },
diff --git a/src/server/ds/setting.h b/src/server/rds/setting.h
similarity index 88%
rename from src/server/ds/setting.h
rename to src/server/rds/setting.h
index 98175de37..b77d24704 100644
--- a/src/server/ds/setting.h
+++ b/src/server/rds/setting.h
@@ -18,18 +18,18 @@
 
 /* option related */
 /*          name            type                default description */
-#define DS_OPTION(ACTION)                                                            \
+#define RDS_OPTION(ACTION)                                                              \
     ACTION( daemonize,      OPTION_TYPE_BOOL,   false,  "daemonize the process"        )\
     ACTION( pid_filename,   OPTION_TYPE_STR,    NULL,   "file storing the pid"         )\
     ACTION( dlog_intvl,     OPTION_TYPE_UINT,   500,    "debug log flush interval(ms)" )
 
 typedef struct {
-    DS_OPTION(OPTION_DECLARE)
-} ds_options_st;
+    RDS_OPTION(OPTION_DECLARE)
+} rds_options_st;
 
 struct setting {
     /* top-level */
-    ds_options_st       ds;
+    rds_options_st      rds;
     /* application modules */
     admin_options_st    admin;
     server_options_st   server;
diff --git a/src/server/ds/stats.c b/src/server/rds/stats.c
similarity index 100%
rename from src/server/ds/stats.c
rename to src/server/rds/stats.c
diff --git a/src/server/ds/stats.h b/src/server/rds/stats.h
similarity index 100%
rename from src/server/ds/stats.h
rename to src/server/rds/stats.h
diff --git a/src/server/slimds/README b/src/server/slimds/README
deleted file mode 100644
index 1dd0faa9e..000000000
--- a/src/server/slimds/README
+++ /dev/null
@@ -1,2 +0,0 @@
-We will probably rename "slimds", which stands for "slim dataserver" right now,
-once we come up with a proper name for the protocol we are using in this binary.
diff --git a/src/server/slimds/CMakeLists.txt b/src/server/slimrds/CMakeLists.txt
similarity index 92%
rename from src/server/slimds/CMakeLists.txt
rename to src/server/slimrds/CMakeLists.txt
index 7071fc103..fbbfa83b6 100644
--- a/src/server/slimds/CMakeLists.txt
+++ b/src/server/slimrds/CMakeLists.txt
@@ -21,7 +21,7 @@ set(LIBS
     ${CMAKE_THREAD_LIBS_INIT})
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/_bin)
-set(TARGET_NAME ${PROJECT_NAME}_slimds)
+set(TARGET_NAME ${PROJECT_NAME}_slimrds)
 
 add_executable(${TARGET_NAME} ${SOURCE})
 target_link_libraries(${TARGET_NAME} ${MODULES} ${LIBS})
diff --git a/src/server/slimrds/README b/src/server/slimrds/README
new file mode 100644
index 000000000..48e12439b
--- /dev/null
+++ b/src/server/slimrds/README
@@ -0,0 +1,3 @@
+We may want to rename "slimrds", which stands for "slim rich data server" right
+now, once we come up with a proper name for the protocol we are using in this
+binary.
diff --git a/src/server/slimds/admin/CMakeLists.txt b/src/server/slimrds/admin/CMakeLists.txt
similarity index 100%
rename from src/server/slimds/admin/CMakeLists.txt
rename to src/server/slimrds/admin/CMakeLists.txt
diff --git a/src/server/slimds/admin/process.c b/src/server/slimrds/admin/process.c
similarity index 82%
rename from src/server/slimds/admin/process.c
rename to src/server/slimrds/admin/process.c
index 347e2586c..cb7cff392 100644
--- a/src/server/slimds/admin/process.c
+++ b/src/server/slimrds/admin/process.c
@@ -6,7 +6,7 @@
 #include <cc_mm.h>
 #include <cc_print.h>
 
-#define SLIMDS_ADMIN_MODULE_NAME "slimds::admin"
+#define SLIMRDS_ADMIN_MODULE_NAME "slimrds::admin"
 
 extern struct stats stats;
 extern unsigned int nmetric;
@@ -18,10 +18,10 @@ static size_t cap;
 void
 admin_process_setup(void)
 {
-    log_info("set up the %s module", SLIMDS_ADMIN_MODULE_NAME);
+    log_info("set up the %s module", SLIMRDS_ADMIN_MODULE_NAME);
     if (admin_init) {
         log_warn("%s has already been setup, overwrite",
-                 SLIMDS_ADMIN_MODULE_NAME);
+                 SLIMRDS_ADMIN_MODULE_NAME);
     }
 
     cap = nmetric * METRIC_PRINT_LEN;
@@ -34,9 +34,9 @@ admin_process_setup(void)
 void
 admin_process_teardown(void)
 {
-    log_info("tear down the %s module", SLIMDS_ADMIN_MODULE_NAME);
+    log_info("tear down the %s module", SLIMRDS_ADMIN_MODULE_NAME);
     if (!admin_init) {
-        log_warn("%s has never been setup", SLIMDS_ADMIN_MODULE_NAME);
+        log_warn("%s has never been setup", SLIMRDS_ADMIN_MODULE_NAME);
     }
 
     admin_init = false;
diff --git a/src/server/slimds/admin/process.h b/src/server/slimrds/admin/process.h
similarity index 100%
rename from src/server/slimds/admin/process.h
rename to src/server/slimrds/admin/process.h
diff --git a/src/server/slimds/data/CMakeLists.txt b/src/server/slimrds/data/CMakeLists.txt
similarity index 100%
rename from src/server/slimds/data/CMakeLists.txt
rename to src/server/slimrds/data/CMakeLists.txt
diff --git a/src/server/slimds/data/cmd_bitmap.c b/src/server/slimrds/data/cmd_bitmap.c
similarity index 100%
rename from src/server/slimds/data/cmd_bitmap.c
rename to src/server/slimrds/data/cmd_bitmap.c
diff --git a/src/server/slimds/data/cmd_bitmap.h b/src/server/slimrds/data/cmd_bitmap.h
similarity index 100%
rename from src/server/slimds/data/cmd_bitmap.h
rename to src/server/slimrds/data/cmd_bitmap.h
diff --git a/src/server/slimds/data/cmd_misc.c b/src/server/slimrds/data/cmd_misc.c
similarity index 100%
rename from src/server/slimds/data/cmd_misc.c
rename to src/server/slimrds/data/cmd_misc.c
diff --git a/src/server/slimds/data/cmd_misc.h b/src/server/slimrds/data/cmd_misc.h
similarity index 100%
rename from src/server/slimds/data/cmd_misc.h
rename to src/server/slimrds/data/cmd_misc.h
diff --git a/src/server/slimds/data/process.c b/src/server/slimrds/data/process.c
similarity index 89%
rename from src/server/slimds/data/process.c
rename to src/server/slimrds/data/process.c
index 1a3c27066..4d74458c0 100644
--- a/src/server/slimds/data/process.c
+++ b/src/server/slimrds/data/process.c
@@ -6,7 +6,7 @@
 #include <cc_debug.h>
 #include <cc_print.h>
 
-#define SLIMDS_PROCESS_MODULE_NAME "slimds::process"
+#define SLIMRDS_PROCESS_MODULE_NAME "slimrds::process"
 
 #define OVERSIZE_ERR_MSG    "oversized value, cannot be stored"
 #define OOM_ERR_MSG         "server is out of memory"
@@ -23,11 +23,11 @@ process_metrics_st *process_metrics = NULL;
 void
 process_setup(process_options_st *options, process_metrics_st *metrics)
 {
-    log_info("set up the %s module", SLIMDS_PROCESS_MODULE_NAME);
+    log_info("set up the %s module", SLIMRDS_PROCESS_MODULE_NAME);
 
     if (process_init) {
         log_warn("%s has already been setup, overwrite",
-                 SLIMDS_PROCESS_MODULE_NAME);
+                 SLIMRDS_PROCESS_MODULE_NAME);
     }
 
     process_metrics = metrics;
@@ -49,9 +49,9 @@ process_setup(process_options_st *options, process_metrics_st *metrics)
 void
 process_teardown(void)
 {
-    log_info("tear down the %s module", SLIMDS_PROCESS_MODULE_NAME);
+    log_info("tear down the %s module", SLIMRDS_PROCESS_MODULE_NAME);
     if (!process_init) {
-        log_warn("%s has never been setup", SLIMDS_PROCESS_MODULE_NAME);
+        log_warn("%s has never been setup", SLIMRDS_PROCESS_MODULE_NAME);
     }
 
     command_registry[REQ_PING] = cmd_ping;
@@ -88,7 +88,7 @@ process_request(struct response *rsp, struct request *req)
 }
 
 int
-slimds_process_read(struct buf **rbuf, struct buf **wbuf, void **data)
+slimrds_process_read(struct buf **rbuf, struct buf **wbuf, void **data)
 {
     parse_rstatus_e status;
     struct request *req; /* data should be NULL or hold a req pointer */
@@ -164,7 +164,7 @@ slimds_process_read(struct buf **rbuf, struct buf **wbuf, void **data)
 
 
 int
-slimds_process_write(struct buf **rbuf, struct buf **wbuf, void **data)
+slimrds_process_write(struct buf **rbuf, struct buf **wbuf, void **data)
 {
     log_verb("post-write processing");
 
@@ -178,7 +178,7 @@ slimds_process_write(struct buf **rbuf, struct buf **wbuf, void **data)
 
 
 int
-slimds_process_error(struct buf **rbuf, struct buf **wbuf, void **data)
+slimrds_process_error(struct buf **rbuf, struct buf **wbuf, void **data)
 {
     log_verb("post-error processing");
 
diff --git a/src/server/slimds/data/process.h b/src/server/slimrds/data/process.h
similarity index 85%
rename from src/server/slimds/data/process.h
rename to src/server/slimrds/data/process.h
index 4595af0d2..7c58ec37d 100644
--- a/src/server/slimds/data/process.h
+++ b/src/server/slimrds/data/process.h
@@ -36,6 +36,6 @@ extern bool allow_flush;
 void process_setup(process_options_st *options, process_metrics_st *metrics);
 void process_teardown(void);
 
-int slimds_process_read(struct buf **rbuf, struct buf **wbuf, void **data);
-int slimds_process_write(struct buf **rbuf, struct buf **wbuf, void **data);
-int slimds_process_error(struct buf **rbuf, struct buf **wbuf, void **data);
+int slimrds_process_read(struct buf **rbuf, struct buf **wbuf, void **data);
+int slimrds_process_write(struct buf **rbuf, struct buf **wbuf, void **data);
+int slimrds_process_error(struct buf **rbuf, struct buf **wbuf, void **data);
diff --git a/src/server/slimds/main.c b/src/server/slimrds/main.c
similarity index 92%
rename from src/server/slimds/main.c
rename to src/server/slimrds/main.c
index a85ed9786..702476948 100644
--- a/src/server/slimds/main.c
+++ b/src/server/slimrds/main.c
@@ -14,9 +14,9 @@
 #include <sysexits.h>
 
 struct data_processor worker_processor = {
-    slimds_process_read,
-    slimds_process_write,
-    slimds_process_error,
+    slimrds_process_read,
+    slimrds_process_write,
+    slimrds_process_error,
 };
 
 static void
@@ -24,11 +24,11 @@ show_usage(void)
 {
     log_stdout(
             "Usage:" CRLF
-            "  pelikan_slimds [option|config]" CRLF
+            "  pelikan_slimrds [option|config]" CRLF
             );
     log_stdout(
             "Description:" CRLF
-            "  pelikan_slimds is one of the unified cache backends. " CRLF
+            "  pelikan_slimrds is one of the unified cache backends. " CRLF
             "  It uses cuckoo hashing as storage for various data types. " CRLF
             "  It speaks the RESP protocol." CRLF
             );
@@ -41,7 +41,7 @@ show_usage(void)
             );
     log_stdout(
             "Example:" CRLF
-            "  pelikan_slimds slimds.conf" CRLF CRLF
+            "  pelikan_slimrds slimrds.conf" CRLF CRLF
             "Sample config files can be found under the config dir." CRLF
             );
 }
@@ -92,10 +92,10 @@ setup(void)
     }
 
     /* setup top-level application options */
-    if (option_bool(&setting.slimds.daemonize)) {
+    if (option_bool(&setting.slimrds.daemonize)) {
         daemonize();
     }
-    fname = option_str(&setting.slimds.pid_filename);
+    fname = option_str(&setting.slimrds.pid_filename);
     if (fname != NULL) {
         /* to get the correct pid, call create_pidfile after daemonize */
         create_pidfile(fname);
@@ -124,7 +124,7 @@ setup(void)
     core_worker_setup(&setting.worker, &stats.worker);
 
     /* adding recurring events to maintenance/admin thread */
-    intvl = option_uint(&setting.slimds.dlog_intvl);
+    intvl = option_uint(&setting.slimrds.dlog_intvl);
     if (core_admin_register(intvl, debug_log_flush, NULL) == NULL) {
         log_stderr("Could not register timed event to flush debug log");
         goto error;
diff --git a/src/server/slimds/setting.c b/src/server/slimrds/setting.c
similarity index 94%
rename from src/server/slimds/setting.c
rename to src/server/slimrds/setting.c
index 07502c20a..2213461d3 100644
--- a/src/server/slimds/setting.c
+++ b/src/server/slimrds/setting.c
@@ -1,7 +1,7 @@
 #include "setting.h"
 
 struct setting setting = {
-    { SLIMDS_OPTION(OPTION_INIT)    },
+    { SLIMRDS_OPTION(OPTION_INIT)   },
     { ADMIN_OPTION(OPTION_INIT)     },
     { SERVER_OPTION(OPTION_INIT)    },
     { WORKER_OPTION(OPTION_INIT)    },
diff --git a/src/server/slimds/setting.h b/src/server/slimrds/setting.h
similarity index 88%
rename from src/server/slimds/setting.h
rename to src/server/slimrds/setting.h
index a60a6e74a..5a48a64fd 100644
--- a/src/server/slimds/setting.h
+++ b/src/server/slimrds/setting.h
@@ -17,18 +17,18 @@
 
 /* option related */
 /*          name            type                default description */
-#define SLIMDS_OPTION(ACTION)                                                        \
+#define SLIMRDS_OPTION(ACTION)                                                          \
     ACTION( daemonize,      OPTION_TYPE_BOOL,   false,  "daemonize the process"        )\
     ACTION( pid_filename,   OPTION_TYPE_STR,    NULL,   "file storing the pid"         )\
     ACTION( dlog_intvl,     OPTION_TYPE_UINT,   500,    "debug log flush interval(ms)" )
 
 typedef struct {
-    SLIMDS_OPTION(OPTION_DECLARE)
-} slimds_options_st;
+    SLIMRDS_OPTION(OPTION_DECLARE)
+} slimrds_options_st;
 
 struct setting {
     /* top-level */
-    slimds_options_st   slimds;
+    slimrds_options_st  slimrds;
     /* application modules */
     admin_options_st    admin;
     server_options_st   server;
diff --git a/src/server/slimds/stats.c b/src/server/slimrds/stats.c
similarity index 100%
rename from src/server/slimds/stats.c
rename to src/server/slimrds/stats.c
diff --git a/src/server/slimds/stats.h b/src/server/slimrds/stats.h
similarity index 100%
rename from src/server/slimds/stats.h
rename to src/server/slimrds/stats.h