diff --git a/doc/jsonrpc.md b/doc/jsonrpc.md
index 357c5ff44..4b0e4e9b2 100644
--- a/doc/jsonrpc.md
+++ b/doc/jsonrpc.md
@@ -251,7 +251,7 @@ Example response:
     "clear_log_flag",
     "set_log_flag",
     "get_log_level",
-    "set_log_level",
+    "log_set_level",
     "log_get_print_level",
     "log_set_print_level",
     "get_iscsi_global_params",
diff --git a/lib/log_rpc/log_rpc.c b/lib/log_rpc/log_rpc.c
index 3f830c03c..12da8cb9d 100644
--- a/lib/log_rpc/log_rpc.c
+++ b/lib/log_rpc/log_rpc.c
@@ -169,7 +169,7 @@ SPDK_RPC_REGISTER("log_get_print_level", spdk_rpc_log_get_print_level,
 SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_get_print_level, get_log_print_level)
 
 static void
-spdk_rpc_set_log_level(struct spdk_jsonrpc_request *request,
+spdk_rpc_log_set_level(struct spdk_jsonrpc_request *request,
 		       const struct spdk_json_val *params)
 {
 	struct rpc_log_level req = {};
@@ -204,7 +204,8 @@ spdk_rpc_set_log_level(struct spdk_jsonrpc_request *request,
 invalid:
 	free_rpc_log_level(&req);
 }
-SPDK_RPC_REGISTER("set_log_level", spdk_rpc_set_log_level, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME)
+SPDK_RPC_REGISTER("log_set_level", spdk_rpc_log_set_level, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME)
+SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_set_level, set_log_level)
 
 static void
 spdk_rpc_get_log_level(struct spdk_jsonrpc_request *request,
diff --git a/scripts/rpc.py b/scripts/rpc.py
index e20ae09d4..d840cbfd8 100755
--- a/scripts/rpc.py
+++ b/scripts/rpc.py
@@ -1147,12 +1147,13 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
     p = subparsers.add_parser('get_log_flags', help='get log flags', aliases=['get_trace_flags'])
     p.set_defaults(func=get_log_flags)
 
-    def set_log_level(args):
-        rpc.log.set_log_level(args.client, level=args.level)
+    def log_set_level(args):
+        rpc.log.log_set_level(args.client, level=args.level)
 
-    p = subparsers.add_parser('set_log_level', help='set log level')
+    p = subparsers.add_parser('log_set_level', aliases=['set_log_level'],
+                              help='set log level')
     p.add_argument('level', help='log level we want to set. (for example "DEBUG").')
-    p.set_defaults(func=set_log_level)
+    p.set_defaults(func=log_set_level)
 
     def get_log_level(args):
         print_dict(rpc.log.get_log_level(args.client))
diff --git a/scripts/rpc/client.py b/scripts/rpc/client.py
index 6861f4d29..9f5cf73e7 100644
--- a/scripts/rpc/client.py
+++ b/scripts/rpc/client.py
@@ -27,7 +27,7 @@ class JSONRPCClient(object):
         ch.setLevel(logging.DEBUG)
         self._logger = logging.getLogger("JSONRPCClient(%s)" % addr)
         self._logger.addHandler(ch)
-        self.set_log_level(kwargs.get('log_level', logging.ERROR))
+        self.log_set_level(kwargs.get('log_level', logging.ERROR))
 
         self.timeout = timeout
         self._request_id = 0
@@ -69,7 +69,7 @@ class JSONRPCClient(object):
     Args:
         lvl: Log level to set as accepted by logger.setLevel
     """
-    def set_log_level(self, lvl):
+    def log_set_level(self, lvl):
         self._logger.info("Setting log level to %s", lvl)
         self._logger.setLevel(lvl)
         self._logger.info("Log level set to %s", lvl)
diff --git a/scripts/rpc/log.py b/scripts/rpc/log.py
index 319380063..89027576e 100644
--- a/scripts/rpc/log.py
+++ b/scripts/rpc/log.py
@@ -33,14 +33,15 @@ def get_log_flags(client):
     return client.call('get_log_flags')
 
 
-def set_log_level(client, level):
+@deprecated_alias('set_log_level')
+def log_set_level(client, level):
     """Set log level.
 
     Args:
         level: log level we want to set. (for example "DEBUG")
     """
     params = {'level': level}
-    return client.call('set_log_level', params)
+    return client.call('log_set_level', params)
 
 
 def get_log_level(client):
diff --git a/scripts/spdkcli/ui_root.py b/scripts/spdkcli/ui_root.py
index 6ad89b535..841dcd98f 100644
--- a/scripts/spdkcli/ui_root.py
+++ b/scripts/spdkcli/ui_root.py
@@ -57,9 +57,9 @@ class UIRoot(UINode):
         # Do not use for "get_*" methods so that output is not
         # flooded.
         def w(self, **kwargs):
-            self.client.set_log_level("INFO" if self.verbose else "ERROR")
+            self.client.log_set_level("INFO" if self.verbose else "ERROR")
             r = f(self, **kwargs)
-            self.client.set_log_level("ERROR")
+            self.client.log_set_level("ERROR")
             return r
         return w