diff --git a/src/core/admin/admin.c b/src/core/admin/admin.c
index eea8cddcb..8449c8074 100644
--- a/src/core/admin/admin.c
+++ b/src/core/admin/admin.c
@@ -118,7 +118,7 @@ _admin_read(struct buf_sock *s)
 static void
 _admin_post_read(struct buf_sock *s)
 {
-    parse_rstatus_t status;
+    parse_rstatus_e status;
 
     admin_request_reset(&req);
 
diff --git a/src/protocol/admin/compose.c b/src/protocol/admin/compose.c
index c469d1121..abb95b97c 100644
--- a/src/protocol/admin/compose.c
+++ b/src/protocol/admin/compose.c
@@ -18,7 +18,7 @@ static struct bstring rsp_strings[] = {
 };
 #undef GET_STRING
 
-static inline compose_rstatus_t
+static inline compose_rstatus_e
 _check_buf_size(struct buf **buf, uint32_t n)
 {
     while (n > buf_wsize(*buf)) {
diff --git a/src/protocol/admin/compose.h b/src/protocol/admin/compose.h
index 6c33efa5b..a1e2b3c02 100644
--- a/src/protocol/admin/compose.h
+++ b/src/protocol/admin/compose.h
@@ -4,7 +4,7 @@ typedef enum compose_rstatus {
     COMPOSE_OK         = 0,
     COMPOSE_ENOMEM     = -1,
     COMPOSE_EOVERSIZED = -2,
-} compose_rstatus_t;
+} compose_rstatus_e;
 
 struct buf;
 struct request;
diff --git a/src/protocol/admin/parse.c b/src/protocol/admin/parse.c
index 3cede69ab..ecf40befb 100644
--- a/src/protocol/admin/parse.c
+++ b/src/protocol/admin/parse.c
@@ -21,7 +21,7 @@ _is_crlf(struct buf *buf, char *p)
     return false;
 }
 
-static inline parse_rstatus_t
+static inline parse_rstatus_e
 _get_req_type(struct request *req, struct bstring *type)
 {
     ASSERT(req->type == REQ_UNKNOWN);
@@ -60,7 +60,7 @@ _get_req_type(struct request *req, struct bstring *type)
     return PARSE_OK;
 }
 
-parse_rstatus_t
+parse_rstatus_e
 admin_parse_req(struct request *req, struct buf *buf)
 {
     char *p, *q;
diff --git a/src/protocol/admin/parse.h b/src/protocol/admin/parse.h
index 14ad7651c..c929fca22 100644
--- a/src/protocol/admin/parse.h
+++ b/src/protocol/admin/parse.h
@@ -5,9 +5,9 @@ typedef enum parse_rstatus {
     PARSE_EUNFIN    = -1,
     PARSE_EINVALID  = -2,
     PARSE_EOTHER    = -3,
-} parse_rstatus_t;
+} parse_rstatus_e;
 
 struct buf;
 struct request;
 
-parse_rstatus_t admin_parse_req(struct request *req, struct buf *buf);
+parse_rstatus_e admin_parse_req(struct request *req, struct buf *buf);
diff --git a/src/protocol/data/memcache/compose.c b/src/protocol/data/memcache/compose.c
index c7a7bc1fc..e27ebc36a 100644
--- a/src/protocol/data/memcache/compose.c
+++ b/src/protocol/data/memcache/compose.c
@@ -48,7 +48,7 @@ compose_teardown(void)
  * common functions
  */
 
-static inline compose_rstatus_t
+static inline compose_rstatus_e
 _check_buf_size(struct buf **buf, uint32_t n)
 {
     while (n > buf_wsize(*buf)) {
diff --git a/src/protocol/data/memcache/compose.h b/src/protocol/data/memcache/compose.h
index 0b15f8c42..99226b608 100644
--- a/src/protocol/data/memcache/compose.h
+++ b/src/protocol/data/memcache/compose.h
@@ -30,7 +30,7 @@ typedef enum compose_rstatus {
     COMPOSE_ENOMEM      = -2,
     COMPOSE_EINVALID    = -3,
     COMPOSE_EOTHER      = -4,
-} compose_rstatus_t;
+} compose_rstatus_e;
 
 struct request;
 struct response;
diff --git a/src/protocol/data/memcache/parse.c b/src/protocol/data/memcache/parse.c
index 4afed77f6..7498c99ab 100644
--- a/src/protocol/data/memcache/parse.c
+++ b/src/protocol/data/memcache/parse.c
@@ -51,7 +51,7 @@ parse_teardown(void)
  * common functions
  */
 /* CRLF is special and we need to "peek into the future" */
-static inline parse_rstatus_t
+static inline parse_rstatus_e
 _try_crlf(struct buf *buf, char *p)
 {
     if (*p != CR) {
@@ -80,7 +80,7 @@ _token_begin(struct bstring *t, char *p)
 static inline bool
 _token_end(bool *end, struct buf *buf, char *p)
 {
-    parse_rstatus_t status;
+    parse_rstatus_e status;
 
     status = _try_crlf(buf, p);
     if (status == PARSE_OK) {
@@ -109,11 +109,11 @@ _token_oversize(struct buf *buf, char *p)
 }
 
 
-static parse_rstatus_t
+static parse_rstatus_e
 _chase_crlf(struct buf *buf)
 {
     char *p;
-    parse_rstatus_t status;
+    parse_rstatus_e status;
 
     for (p = buf->rpos; p < buf->wpos; p++) {
         if (_token_oversize(buf, p)) {
@@ -151,7 +151,7 @@ _chase_crlf(struct buf *buf)
     return PARSE_EUNFIN;
 }
 
-static inline parse_rstatus_t
+static inline parse_rstatus_e
 _check_key(struct buf *buf, bool *end, struct bstring *t, char *p)
 {
     bool complete;
@@ -181,11 +181,11 @@ _check_key(struct buf *buf, bool *end, struct bstring *t, char *p)
     return PARSE_EUNFIN;
 }
 
-static parse_rstatus_t
+static parse_rstatus_e
 _chase_key(struct buf *buf, bool *end, struct bstring *t)
 {
     char *p;
-    parse_rstatus_t status;
+    parse_rstatus_e status;
 
     for (p = buf->rpos; p < buf->wpos; p++) {
         if (_token_oversize(buf, p)) {
@@ -201,7 +201,7 @@ _chase_key(struct buf *buf, bool *end, struct bstring *t)
     return PARSE_EUNFIN;
 }
 
-static inline parse_rstatus_t
+static inline parse_rstatus_e
 _check_uint(uint64_t *num, struct buf *buf, bool *end, size_t *len,
         char *p, uint64_t max)
 {
@@ -250,11 +250,11 @@ _check_uint(uint64_t *num, struct buf *buf, bool *end, size_t *len,
     return PARSE_EUNFIN;
 }
 
-static parse_rstatus_t
+static parse_rstatus_e
 _chase_uint(uint64_t *num, struct buf *buf, bool *end, uint64_t max)
 {
     char *p;
-    parse_rstatus_t status;
+    parse_rstatus_e status;
     size_t len = 0;
 
     *num = 0;
@@ -272,10 +272,10 @@ _chase_uint(uint64_t *num, struct buf *buf, bool *end, uint64_t max)
     return PARSE_EUNFIN;
 }
 
-static parse_rstatus_t
+static parse_rstatus_e
 _parse_val(struct bstring *val, struct buf *buf, uint32_t nbyte)
 {
-    parse_rstatus_t status;
+    parse_rstatus_e status;
     uint32_t rsize = buf_rsize(buf);
 
     log_verb("parsing val (string) at %p", buf->rpos);
@@ -307,7 +307,7 @@ _parse_val(struct bstring *val, struct buf *buf, uint32_t nbyte)
  * request specific functions
  */
 
-static inline parse_rstatus_t
+static inline parse_rstatus_e
 _check_req_type(struct request *req, struct buf *buf, bool *end, struct bstring *t,
         char *p)
 {
@@ -430,11 +430,11 @@ _check_req_type(struct request *req, struct buf *buf, bool *end, struct bstring
     return PARSE_EUNFIN;
 }
 
-static parse_rstatus_t
+static parse_rstatus_e
 _chase_req_type(struct request *req, struct buf *buf, bool *end)
 {
     char *p;
-    parse_rstatus_t status;
+    parse_rstatus_e status;
     struct bstring t;
 
     bstring_init(&t);
@@ -452,7 +452,7 @@ _chase_req_type(struct request *req, struct buf *buf, bool *end)
     return PARSE_EUNFIN;
 }
 
-static inline parse_rstatus_t
+static inline parse_rstatus_e
 _push_key(struct request *req, struct bstring *t)
 {
     struct bstring *k;
@@ -471,7 +471,7 @@ _push_key(struct request *req, struct bstring *t)
 }
 
 
-static inline parse_rstatus_t
+static inline parse_rstatus_e
 _check_noreply(struct buf *buf, bool *end, struct bstring *t, char *p)
 {
     bool complete;
@@ -505,7 +505,7 @@ _check_noreply(struct buf *buf, bool *end, struct bstring *t, char *p)
     return PARSE_EUNFIN;
 }
 
-static parse_rstatus_t
+static parse_rstatus_e
 _chase_noreply(struct request *req, struct buf *buf, bool *end)
 {
     char *p;
@@ -538,10 +538,10 @@ _chase_noreply(struct request *req, struct buf *buf, bool *end)
 }
 
 
-static parse_rstatus_t
+static parse_rstatus_e
 _subrequest_delete(struct request *req, struct buf *buf, bool *end)
 {
-    parse_rstatus_t status;
+    parse_rstatus_e status;
     struct bstring t;
 
     /* parsing order:
@@ -562,10 +562,10 @@ _subrequest_delete(struct request *req, struct buf *buf, bool *end)
     return _chase_noreply(req, buf, end);
 }
 
-static parse_rstatus_t
+static parse_rstatus_e
 _subrequest_arithmetic(struct request *req, struct buf *buf, bool *end)
 {
-    parse_rstatus_t status;
+    parse_rstatus_e status;
     uint64_t delta;
     struct bstring t;
 
@@ -606,10 +606,10 @@ _subrequest_arithmetic(struct request *req, struct buf *buf, bool *end)
 }
 
 
-static parse_rstatus_t
+static parse_rstatus_e
 _subrequest_store(struct request *req, struct buf *buf, bool *end, bool cas)
 {
-    parse_rstatus_t status;
+    parse_rstatus_e status;
     uint64_t n;
     struct bstring t;
 
@@ -687,10 +687,10 @@ _subrequest_store(struct request *req, struct buf *buf, bool *end, bool cas)
 }
 
 
-static parse_rstatus_t
+static parse_rstatus_e
 _subrequest_retrieve(struct request *req, struct buf *buf, bool *end)
 {
-    parse_rstatus_t status;
+    parse_rstatus_e status;
     struct bstring t;
 
     while (true) {
@@ -717,10 +717,10 @@ _subrequest_retrieve(struct request *req, struct buf *buf, bool *end)
 }
 
 /* parse the first line("header") according to memcache ASCII protocol */
-static parse_rstatus_t
+static parse_rstatus_e
 _parse_req_hdr(struct request *req, struct buf *buf)
 {
-    parse_rstatus_t status;
+    parse_rstatus_e status;
     bool end = false;
 
     ASSERT(req != NULL);
@@ -784,10 +784,10 @@ _parse_req_hdr(struct request *req, struct buf *buf)
     return status;
 }
 
-parse_rstatus_t
+parse_rstatus_e
 parse_req(struct request *req, struct buf *buf)
 {
-    parse_rstatus_t status = PARSE_OK;
+    parse_rstatus_e status = PARSE_OK;
     char *old_rpos = buf->rpos;
     bool leftmost = (buf->rpos == buf->begin);
 
@@ -888,7 +888,7 @@ parse_req(struct request *req, struct buf *buf)
  * response specific functions
  */
 
-static inline parse_rstatus_t
+static inline parse_rstatus_e
 _check_rsp_type(struct response *rsp, struct buf *buf, bool *end, struct bstring *t,
         char *p)
 {
@@ -1008,11 +1008,11 @@ _check_rsp_type(struct response *rsp, struct buf *buf, bool *end, struct bstring
 }
 
 
-static parse_rstatus_t
+static parse_rstatus_e
 _chase_rsp_type(struct response *rsp, struct buf *buf, bool *end)
 {
     char *p;
-    parse_rstatus_t status;
+    parse_rstatus_e status;
     uint64_t n = 0;
     struct bstring t;
 
@@ -1045,10 +1045,10 @@ _chase_rsp_type(struct response *rsp, struct buf *buf, bool *end)
     return PARSE_EUNFIN;
 }
 
-static parse_rstatus_t
+static parse_rstatus_e
 _subresponse_stat(struct response *rsp, struct buf *buf, bool *end)
 {
-    parse_rstatus_t status;
+    parse_rstatus_e status;
     uint64_t n;
     struct bstring t;
 
@@ -1078,10 +1078,10 @@ _subresponse_stat(struct response *rsp, struct buf *buf, bool *end)
     return status;
 }
 
-static parse_rstatus_t
+static parse_rstatus_e
 _subresponse_value(struct response *rsp, struct buf *buf, bool *end)
 {
-    parse_rstatus_t status;
+    parse_rstatus_e status;
     uint64_t n;
     struct bstring t;
 
@@ -1134,10 +1134,10 @@ _subresponse_value(struct response *rsp, struct buf *buf, bool *end)
     return PARSE_EOTHER;
 }
 
-static parse_rstatus_t
+static parse_rstatus_e
 _subresponse_error(struct response *rsp, struct buf *buf, bool *end)
 {
-    parse_rstatus_t status;
+    parse_rstatus_e status;
     char *p;
     struct bstring t;
 
@@ -1181,10 +1181,10 @@ _subresponse_error(struct response *rsp, struct buf *buf, bool *end)
 }
 
 
-static parse_rstatus_t
+static parse_rstatus_e
 _parse_rsp_hdr(struct response *rsp, struct buf *buf)
 {
-    parse_rstatus_t status;
+    parse_rstatus_e status;
     bool end = false;
 
     ASSERT(rsp != NULL);
@@ -1244,10 +1244,10 @@ _parse_rsp_hdr(struct response *rsp, struct buf *buf)
     return status;
 }
 
-parse_rstatus_t
+parse_rstatus_e
 parse_rsp(struct response *rsp, struct buf *buf)
 {
-    parse_rstatus_t status = PARSE_EUNFIN;
+    parse_rstatus_e status = PARSE_EUNFIN;
     char *old_rpos = buf->rpos;
 
     ASSERT(rsp->rstate == RSP_PARSING);
diff --git a/src/protocol/data/memcache/parse.h b/src/protocol/data/memcache/parse.h
index 6d9dc5c13..48f2cd94f 100644
--- a/src/protocol/data/memcache/parse.h
+++ b/src/protocol/data/memcache/parse.h
@@ -37,7 +37,7 @@ typedef enum parse_rstatus {
     PARSE_EOVERSIZE = -3,
     PARSE_EINVALID  = -4,
     PARSE_EOTHER    = -5,
-} parse_rstatus_t;
+} parse_rstatus_e;
 
 struct request;
 struct response;
@@ -45,6 +45,6 @@ struct response;
 void parse_setup(parse_req_metrics_st *req, parse_rsp_metrics_st *rsp);
 void parse_teardown(void);
 
-parse_rstatus_t parse_req(struct request *req, struct buf *buf);
+parse_rstatus_e parse_req(struct request *req, struct buf *buf);
 
-parse_rstatus_t parse_rsp(struct response *rsp, struct buf *buf);
+parse_rstatus_e parse_rsp(struct response *rsp, struct buf *buf);
diff --git a/src/protocol/data/ping/compose.c b/src/protocol/data/ping/compose.c
index fe8d442b4..1759e30f5 100644
--- a/src/protocol/data/ping/compose.c
+++ b/src/protocol/data/ping/compose.c
@@ -37,7 +37,7 @@ compose_teardown(void)
     compose_init = false;
 }
 
-compose_rstatus_t
+compose_rstatus_e
 compose_req(struct buf **buf)
 {
     log_verb("composing request to buf %p", buf);
@@ -54,7 +54,7 @@ compose_req(struct buf **buf)
     return COMPOSE_OK;
 }
 
-compose_rstatus_t
+compose_rstatus_e
 compose_rsp(struct buf **buf)
 {
     log_verb("composing response to buf %p", buf);
diff --git a/src/protocol/data/ping/compose.h b/src/protocol/data/ping/compose.h
index 7f597b7fd..47163dce4 100644
--- a/src/protocol/data/ping/compose.h
+++ b/src/protocol/data/ping/compose.h
@@ -27,10 +27,10 @@ typedef struct {
 typedef enum compose_rstatus {
     COMPOSE_OK          = 0,
     COMPOSE_ENOMEM      = -1,
-} compose_rstatus_t;
+} compose_rstatus_e;
 
 void compose_setup(compose_req_metrics_st *req, compose_rsp_metrics_st *rsp);
 void compose_teardown(void);
 
-compose_rstatus_t compose_req(struct buf **buf);
-compose_rstatus_t compose_rsp(struct buf **buf);
+compose_rstatus_e compose_req(struct buf **buf);
+compose_rstatus_e compose_rsp(struct buf **buf);
diff --git a/src/protocol/data/ping/parse.c b/src/protocol/data/ping/parse.c
index 3571e7c84..533632b21 100644
--- a/src/protocol/data/ping/parse.c
+++ b/src/protocol/data/ping/parse.c
@@ -37,7 +37,7 @@ parse_teardown(void)
     parse_init = false;
 }
 
-parse_rstatus_t
+parse_rstatus_e
 parse_req(struct buf *buf)
 {
     log_verb("parsing buf %p", buf);
@@ -56,7 +56,7 @@ parse_req(struct buf *buf)
     }
 }
 
-parse_rstatus_t
+parse_rstatus_e
 parse_rsp(struct buf *buf)
 {
     log_verb("parsing buf %p", buf);
@@ -74,4 +74,3 @@ parse_rsp(struct buf *buf)
         return PARSE_EOTHER;
     }
 }
-
diff --git a/src/protocol/data/ping/parse.h b/src/protocol/data/ping/parse.h
index 9e4827613..31a1990dc 100644
--- a/src/protocol/data/ping/parse.h
+++ b/src/protocol/data/ping/parse.h
@@ -34,10 +34,10 @@ typedef enum parse_rstatus {
     PARSE_OK        = 0,
     PARSE_EUNFIN    = -1,
     PARSE_EOTHER    = -2,
-} parse_rstatus_t;
+} parse_rstatus_e;
 
 void parse_setup(parse_req_metrics_st *req, parse_rsp_metrics_st *rsp);
 void parse_teardown(void);
 
-parse_rstatus_t parse_req(struct buf *buf);
-parse_rstatus_t parse_rsp(struct buf *buf);
+parse_rstatus_e parse_req(struct buf *buf);
+parse_rstatus_e parse_rsp(struct buf *buf);
diff --git a/src/protocol/data/redis/parse.c b/src/protocol/data/redis/parse.c
index 3d654fa40..91477d97f 100644
--- a/src/protocol/data/redis/parse.c
+++ b/src/protocol/data/redis/parse.c
@@ -45,7 +45,7 @@ parse_teardown(void)
     parse_init = false;
 }
 
-static parse_rstatus_t
+static parse_rstatus_e
 _parse_cmd(struct request *req)
 {
     cmd_type_e type;
@@ -82,10 +82,10 @@ _parse_cmd(struct request *req)
 }
 
 
-parse_rstatus_t
+parse_rstatus_e
 parse_req(struct request *req, struct buf *buf)
 {
-    parse_rstatus_t status = PARSE_OK;
+    parse_rstatus_e status = PARSE_OK;
     char *old_rpos = buf->rpos;
     int64_t nelem;
     struct element *el;
@@ -144,10 +144,10 @@ parse_req(struct request *req, struct buf *buf)
     return PARSE_OK;
 }
 
-parse_rstatus_t
+parse_rstatus_e
 parse_rsp(struct response *rsp, struct buf *buf)
 {
-    parse_rstatus_t status = PARSE_OK;
+    parse_rstatus_e status = PARSE_OK;
     char *old_rpos = buf->rpos;
     int64_t nelem = 1;
     struct element *el;
diff --git a/src/protocol/data/redis/parse.h b/src/protocol/data/redis/parse.h
index 50c7bebff..bcf283d7c 100644
--- a/src/protocol/data/redis/parse.h
+++ b/src/protocol/data/redis/parse.h
@@ -43,6 +43,6 @@ key_valid(struct bstring *key)
     return (key->len > 0 && key->len <= KEY_MAXLEN);
 }
 
-parse_rstatus_t parse_req(struct request *req, struct buf *buf);
+parse_rstatus_e parse_req(struct request *req, struct buf *buf);
 
-parse_rstatus_t parse_rsp(struct response *rsp, struct buf *buf);
+parse_rstatus_e parse_rsp(struct response *rsp, struct buf *buf);
diff --git a/src/protocol/data/redis/token.c b/src/protocol/data/redis/token.c
index 5fc6a1a87..1f9602716 100644
--- a/src/protocol/data/redis/token.c
+++ b/src/protocol/data/redis/token.c
@@ -18,7 +18,7 @@
 #define NIL_STR "$-1\r\n"
 
 
-static inline compose_rstatus_t
+static inline compose_rstatus_e
 _check_buf_size(struct buf **buf, uint32_t n)
 {
     while (n > buf_wsize(*buf)) {
@@ -34,7 +34,7 @@ _check_buf_size(struct buf **buf, uint32_t n)
 }
 
 
-static parse_rstatus_t
+static parse_rstatus_e
 _read_str(struct bstring *str, struct buf *buf)
 {
     /*
@@ -67,7 +67,7 @@ _read_str(struct bstring *str, struct buf *buf)
 }
 
 
-static parse_rstatus_t
+static parse_rstatus_e
 _read_int(int64_t *num, struct buf *buf, int64_t min, int64_t max)
 {
     /*
@@ -114,10 +114,10 @@ _read_int(int64_t *num, struct buf *buf, int64_t min, int64_t max)
     return PARSE_EUNFIN;
 }
 
-static parse_rstatus_t
+static parse_rstatus_e
 _read_bulk(struct bstring *str, struct buf *buf)
 {
-    parse_rstatus_t status;
+    parse_rstatus_e status;
     int64_t len;
 
     bstring_init(str);
@@ -189,10 +189,10 @@ token_is_array(struct buf *buf)
     return (buf_rsize(buf) > 0 && *(buf->rpos) == '*');
 }
 
-parse_rstatus_t
+parse_rstatus_e
 token_array_nelem(int64_t *nelem, struct buf *buf)
 {
-    parse_rstatus_t status;
+    parse_rstatus_e status;
     char *pos;
 
     ASSERT(nelem != NULL && buf != NULL);
@@ -209,11 +209,11 @@ token_array_nelem(int64_t *nelem, struct buf *buf)
 
 
 /* this function does not handle array, which is a composite type */
-parse_rstatus_t
+parse_rstatus_e
 parse_element(struct element *el, struct buf *buf)
 {
     char *p;
-    parse_rstatus_t status;
+    parse_rstatus_e status;
 
     log_verb("detecting the next element %p in buf %p", el, buf);
 
diff --git a/src/protocol/data/redis/token.h b/src/protocol/data/redis/token.h
index 7fffcb358..15b2ff618 100644
--- a/src/protocol/data/redis/token.h
+++ b/src/protocol/data/redis/token.h
@@ -58,7 +58,7 @@ typedef enum parse_rstatus {
     PARSE_EOVERSIZE = -3,
     PARSE_EINVALID  = -4,
     PARSE_EOTHER    = -5,
-} parse_rstatus_t;
+} parse_rstatus_e;
 
 typedef enum compose_rstatus {
     COMPOSE_OK          = 0,
@@ -66,7 +66,7 @@ typedef enum compose_rstatus {
     COMPOSE_ENOMEM      = -2,
     COMPOSE_EINVALID    = -3,
     COMPOSE_EOTHER      = -4,
-} compose_rstatus_t;
+} compose_rstatus_e;
 
 /* array is not a basic element type */
 typedef enum element_type {
@@ -103,8 +103,8 @@ line_end(struct buf *buf)
 }
 
 bool token_is_array(struct buf *buf);
-parse_rstatus_t token_array_nelem(int64_t *nelem, struct buf *buf);
-parse_rstatus_t parse_element(struct element *el, struct buf *buf);
+parse_rstatus_e token_array_nelem(int64_t *nelem, struct buf *buf);
+parse_rstatus_e parse_element(struct element *el, struct buf *buf);
 
 int compose_array_header(struct buf **buf, int nelem);
 int compose_element(struct buf **buf, struct element *el);
diff --git a/src/server/cdb/data/process.c b/src/server/cdb/data/process.c
index 52b0b1f9c..6d1c1dfa4 100644
--- a/src/server/cdb/data/process.c
+++ b/src/server/cdb/data/process.c
@@ -187,7 +187,7 @@ _cleanup(struct request *req, struct response *rsp)
 int
 cdb_process_read(struct buf **rbuf, struct buf **wbuf, void **data)
 {
-    parse_rstatus_t status;
+    parse_rstatus_e status;
     struct request *req; /* data should be NULL or hold a req pointer */
     struct response *rsp;
 
diff --git a/src/server/pingserver/data/process.c b/src/server/pingserver/data/process.c
index edeebe1b4..3cf266719 100644
--- a/src/server/pingserver/data/process.c
+++ b/src/server/pingserver/data/process.c
@@ -8,7 +8,7 @@
 int
 pingserver_process_read(struct buf **rbuf, struct buf **wbuf, void **data)
 {
-    parse_rstatus_t status;
+    parse_rstatus_e status;
 
     log_verb("post-read processing");
 
diff --git a/src/server/redis/data/process.c b/src/server/redis/data/process.c
index 382400451..33362eca9 100644
--- a/src/server/redis/data/process.c
+++ b/src/server/redis/data/process.c
@@ -87,7 +87,7 @@ process_request(struct response *rsp, struct request *req)
 int
 redis_process_read(struct buf **rbuf, struct buf **wbuf, void **data)
 {
-    parse_rstatus_t status;
+    parse_rstatus_e status;
     struct request *req; /* data should be NULL or hold a req pointer */
     struct response *rsp;
 
diff --git a/src/server/slimcache/data/process.c b/src/server/slimcache/data/process.c
index ca47e6cd6..e6ea696f3 100644
--- a/src/server/slimcache/data/process.c
+++ b/src/server/slimcache/data/process.c
@@ -451,7 +451,7 @@ _cleanup(struct request **req, struct response **rsp)
 int
 slimcache_process_read(struct buf **rbuf, struct buf **wbuf, void **data)
 {
-    parse_rstatus_t status;
+    parse_rstatus_e status;
     struct request *req;
     struct response *rsp = NULL;
 
diff --git a/src/server/slimredis/data/process.c b/src/server/slimredis/data/process.c
index e092360d6..0d9173f10 100644
--- a/src/server/slimredis/data/process.c
+++ b/src/server/slimredis/data/process.c
@@ -90,7 +90,7 @@ process_request(struct response *rsp, struct request *req)
 int
 slimredis_process_read(struct buf **rbuf, struct buf **wbuf, void **data)
 {
-    parse_rstatus_t status;
+    parse_rstatus_e status;
     struct request *req; /* data should be NULL or hold a req pointer */
     struct response *rsp;
 
diff --git a/src/server/twemcache/data/process.c b/src/server/twemcache/data/process.c
index 8fd9e1aa5..f217d9e66 100644
--- a/src/server/twemcache/data/process.c
+++ b/src/server/twemcache/data/process.c
@@ -20,7 +20,7 @@ typedef enum put_rstatus {
     PUT_OK,
     PUT_PARTIAL,
     PUT_ERROR,
-} put_rstatus_t;
+} put_rstatus_e;
 
 static bool process_init = false;
 static process_metrics_st *process_metrics = NULL;
@@ -203,10 +203,10 @@ _error_rsp(struct response *rsp, item_rstatus_t status)
  *   - PUT_OK
  *   - PUT_PARTIAL
  */
-static put_rstatus_t
+static put_rstatus_e
 _put(item_rstatus_t *istatus, struct request *req)
 {
-    put_rstatus_t status;
+    put_rstatus_e status;
     struct item *it = NULL;
 
     *istatus = ITEM_OK;
@@ -247,7 +247,7 @@ _put(item_rstatus_t *istatus, struct request *req)
 static void
 _process_set(struct response *rsp, struct request *req)
 {
-    put_rstatus_t status;
+    put_rstatus_e status;
     item_rstatus_t istatus;
     struct item *it;
     struct bstring key;
@@ -277,7 +277,7 @@ _process_set(struct response *rsp, struct request *req)
 static void
 _process_add(struct response *rsp, struct request *req)
 {
-    put_rstatus_t status;
+    put_rstatus_e status;
     item_rstatus_t istatus;
     struct item *it;
     struct bstring key;
@@ -313,7 +313,7 @@ _process_add(struct response *rsp, struct request *req)
 static void
 _process_replace(struct response *rsp, struct request *req)
 {
-    put_rstatus_t status;
+    put_rstatus_e status;
     item_rstatus_t istatus;
     struct item *it = NULL;
     struct bstring key;
@@ -349,7 +349,7 @@ _process_replace(struct response *rsp, struct request *req)
 static void
 _process_cas(struct response *rsp, struct request *req)
 {
-    put_rstatus_t status;
+    put_rstatus_e status;
     item_rstatus_t istatus;
     struct item *it, *oit;
     struct bstring key;
@@ -643,7 +643,7 @@ _cleanup(struct request *req, struct response *rsp)
 int
 twemcache_process_read(struct buf **rbuf, struct buf **wbuf, void **data)
 {
-    parse_rstatus_t status;
+    parse_rstatus_e status;
     struct request *req; /* data should be NULL or hold a req pointer */
     struct response *rsp;