diff --git a/command.c b/command.c
index fafe0291cf..633ae5205b 100644
--- a/command.c
+++ b/command.c
@@ -46,7 +46,7 @@
 #define COMMAND_EXT_SLANG        0x105ce63aU
 #define COMMAND_EXT_SLANGP       0x1bf9adeaU
 
-struct rarch_cmd
+struct command
 {
 #ifdef HAVE_STDIN_CMD
    bool stdin_enable;
@@ -121,7 +121,7 @@ static const struct cmd_map map[] = {
 };
 
 #if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)
-static bool cmd_init_network(rarch_cmd_t *handle, uint16_t port)
+static bool cmd_init_network(command_t *handle, uint16_t port)
 {
    int fd;
    struct addrinfo *res  = NULL;
@@ -156,7 +156,7 @@ error:
 #endif
 
 #ifdef HAVE_STDIN_CMD
-static bool cmd_init_stdin(rarch_cmd_t *handle)
+static bool cmd_init_stdin(command_t *handle)
 {
 #ifndef _WIN32
 #ifdef HAVE_NETPLAY
@@ -170,10 +170,10 @@ static bool cmd_init_stdin(rarch_cmd_t *handle)
 }
 #endif
 
-rarch_cmd_t *rarch_cmd_new(bool stdin_enable,
+command_t *command_new(bool stdin_enable,
       bool network_enable, uint16_t port)
 {
-   rarch_cmd_t *handle = (rarch_cmd_t*)calloc(1, sizeof(*handle));
+   command_t *handle = (command_t*)calloc(1, sizeof(*handle));
    if (!handle)
       return NULL;
 
@@ -197,7 +197,7 @@ rarch_cmd_t *rarch_cmd_new(bool stdin_enable,
 
 #if (defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)) || defined(HAVE_STDIN_CMD)
 error:
-   rarch_cmd_free(handle);
+   command_free(handle);
    return NULL;
 #endif
 }
@@ -277,7 +277,7 @@ static bool command_get_arg(const char *tok,
    return false;
 }
 
-static void parse_sub_msg(rarch_cmd_t *handle, const char *tok)
+static void parse_sub_msg(command_t *handle, const char *tok)
 {
    const char *arg = NULL;
    unsigned index  = 0;
@@ -299,7 +299,7 @@ static void parse_sub_msg(rarch_cmd_t *handle, const char *tok)
             msg_hash_to_str(MSG_RECEIVED));
 }
 
-static void parse_msg(rarch_cmd_t *handle, char *buf)
+static void parse_msg(command_t *handle, char *buf)
 {
    char *save      = NULL;
    const char *tok = strtok_r(buf, "\n", &save);
@@ -312,7 +312,7 @@ static void parse_msg(rarch_cmd_t *handle, char *buf)
 }
 
 #if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)
-static void network_cmd_poll(rarch_cmd_t *handle)
+static void network_cmd_poll(command_t *handle)
 {
    fd_set fds;
    struct timeval tmp_tv = {0};
@@ -451,7 +451,7 @@ static size_t read_stdin(char *buf, size_t size)
 }
 #endif
 
-static void stdin_cmd_poll(rarch_cmd_t *handle)
+static void stdin_cmd_poll(command_t *handle)
 {
    char *last_newline;
    ssize_t ret;
@@ -564,7 +564,7 @@ static bool verify_command(const char *cmd)
    return false;
 }
 
-bool rarch_cmd_send(const char *cmd_)
+bool command_send(const char *cmd_)
 {
    bool ret;
    char *command       = NULL;
@@ -609,7 +609,7 @@ bool rarch_cmd_send(const char *cmd_)
 }
 #endif
 
-bool rarch_cmd_poll(rarch_cmd_t *handle)
+bool command_poll(command_t *handle)
 {
    memset(handle->state, 0, sizeof(handle->state));
 
@@ -624,7 +624,7 @@ bool rarch_cmd_poll(rarch_cmd_t *handle)
    return true;
 }
 
-bool rarch_cmd_set(rarch_cmd_handle_t *handle)
+bool command_set(command_handle_t *handle)
 {
    if (!handle || !handle->handle)
       return false;
@@ -633,7 +633,7 @@ bool rarch_cmd_set(rarch_cmd_handle_t *handle)
    return true;
 }
 
-bool rarch_cmd_free(rarch_cmd_t *handle)
+bool command_free(command_t *handle)
 {
 #if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)
    if (handle && handle->net_fd >= 0)
@@ -645,7 +645,7 @@ bool rarch_cmd_free(rarch_cmd_t *handle)
    return true;
 }
 
-bool rarch_cmd_get(rarch_cmd_handle_t *handle)
+bool command_get(command_handle_t *handle)
 {
    if (!handle || !handle->handle)
       return false;
diff --git a/command.h b/command.h
index 4f6647a144..2787a651f4 100644
--- a/command.h
+++ b/command.h
@@ -28,28 +28,28 @@
 extern "C" {
 #endif
 
-typedef struct rarch_cmd rarch_cmd_t;
+typedef struct command command_t;
 
-typedef struct rarch_cmd_handle
+typedef struct command_handle
 {
-   rarch_cmd_t *handle;
+   command_t *handle;
    unsigned id;
-} rarch_cmd_handle_t;
+} command_handle_t;
 
-rarch_cmd_t *rarch_cmd_new(bool stdin_enable,
+command_t *command_new(bool stdin_enable,
       bool network_enable, uint16_t port);
 
 #if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)
-bool rarch_cmd_send(const char *cmd_);
+bool command_send(const char *cmd_);
 #endif
 
-bool rarch_cmd_poll(rarch_cmd_t *handle);
+bool command_poll(command_t *handle);
 
-bool rarch_cmd_set(rarch_cmd_handle_t *handle);
+bool command_set(command_handle_t *handle);
 
-bool rarch_cmd_get(rarch_cmd_handle_t *handle);
+bool command_get(command_handle_t *handle);
 
-bool rarch_cmd_free(rarch_cmd_t *handle);
+bool command_free(command_t *handle);
 
 #ifdef __cplusplus
 }
diff --git a/input/input_driver.c b/input/input_driver.c
index 58779019d9..d44efbbb23 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -96,7 +96,7 @@ struct turbo_buttons
 
 static turbo_buttons_t input_driver_turbo_btns;
 #ifdef HAVE_COMMAND
-static rarch_cmd_t *input_driver_command          = NULL;
+static command_t *input_driver_command          = NULL;
 #endif
 #ifdef HAVE_NETWORK_GAMEPAD
 static input_remote_t *input_driver_remote        = NULL;
@@ -275,12 +275,12 @@ static retro_input_t input_driver_keys_pressed(void)
 #ifdef HAVE_COMMAND
       if (input_driver_command)
       {
-         rarch_cmd_handle_t handle;
+         command_handle_t handle;
 
          handle.handle = input_driver_command;
          handle.id     = key;
 
-         state |= rarch_cmd_get(&handle);
+         state |= command_get(&handle);
       }
 #endif
 
@@ -436,7 +436,7 @@ void input_poll(void)
 
 #ifdef HAVE_COMMAND
    if (input_driver_command)
-      rarch_cmd_poll(input_driver_command);
+      command_poll(input_driver_command);
 #endif
 
 #ifdef HAVE_NETWORK_GAMEPAD
@@ -849,7 +849,7 @@ bool input_driver_init_command(void)
             "Cannot use this command interface.\n");
    }
 
-   input_driver_command = rarch_cmd_new(settings->stdin_cmd_enable
+   input_driver_command = command_new(settings->stdin_cmd_enable
          && !input_driver_grab_stdin(),
          settings->network_cmd_enable, settings->network_cmd_port);
 
@@ -869,7 +869,7 @@ void input_driver_deinit_command(void)
 {
 #ifdef HAVE_COMMAND
    if (input_driver_command)
-      rarch_cmd_free(input_driver_command);
+      command_free(input_driver_command);
    input_driver_command = NULL;
 #endif
 }
diff --git a/retroarch.c b/retroarch.c
index 2552f43d77..6e3338d67c 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -952,7 +952,7 @@ static void retroarch_parse_input(int argc, char *argv[])
 
 #if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)
          case RA_OPT_COMMAND:
-            if (rarch_cmd_send((const char*)optarg))
+            if (command_send((const char*)optarg))
                exit(0);
             else
                retroarch_fail(1, "network_cmd_send()");