diff --git a/src/cmd/cli.cpp b/src/cmd/cli.cpp
index 5a6e09ae..88f9f397 100644
--- a/src/cmd/cli.cpp
+++ b/src/cmd/cli.cpp
@@ -264,8 +264,8 @@ static const char* help_text =
     "  Start HTTP server able to handle CLI commands over a REST API. Options:\n"
     "  --bind_address ADDR  Specify server IP address or addresses, separated by space. Default is 127.0.0.1.\n"
     "  --port 8080          Specify server port.\n"
-    "  --server_cert FILE   Path to server TLS certificate file (PEM format).\n"
-    "  --server_pkey FILE   Path to server TLS private key file.\n"
+    "  --api_cert FILE      Path to server TLS certificate file (PEM format).\n"
+    "  --api_pkey FILE      Path to server TLS private key file.\n"
     "  --client_ca FILE     Path to file with TLS CA certificates used to validate client connections.\n"
     "\n"
     "Use vitastor-cli --help <command> for command details or vitastor-cli --help --all for all details.\n"
diff --git a/src/cmd/cli_serve.cpp b/src/cmd/cli_serve.cpp
index 4fa9c758..0911f0de 100644
--- a/src/cmd/cli_serve.cpp
+++ b/src/cmd/cli_serve.cpp
@@ -114,10 +114,10 @@ struct cli_serve_t
             listen_backlog = 128;
         use_perms = json_is_true(parent->cli->config["use_perms"]);
         {
-            std::string tls_cert = (parent->cli->config.find("server_cert") != parent->cli->config.end()
-                ? parent->cli->config["server_cert"].string_value() : "");
-            std::string tls_key = (parent->cli->config.find("server_pkey") != parent->cli->config.end()
-                ? parent->cli->config["server_pkey"].string_value() : "");
+            std::string tls_cert = (parent->cli->config.find("api_cert") != parent->cli->config.end()
+                ? parent->cli->config["api_cert"].string_value() : "");
+            std::string tls_key = (parent->cli->config.find("api_pkey") != parent->cli->config.end()
+                ? parent->cli->config["api_pkey"].string_value() : "");
             std::string tls_ca = (parent->cli->config.find("client_ca") != parent->cli->config.end()
                 ? parent->cli->config["client_ca"].string_value() : "");
             if (tls_cert != "" || tls_key != "" || tls_ca != "")
@@ -125,7 +125,7 @@ struct cli_serve_t
                 ssl = true;
                 if (tls_cert == "" || tls_key == "")
                 {
-                    result = (cli_result_t){ .err = EINVAL, .text = "server_cert and server_pkey are required to serve HTTPS" };
+                    result = (cli_result_t){ .err = EINVAL, .text = "api_cert and api_pkey are required to serve HTTPS" };
                     state = 100;
                     return;
                 }