diff --git a/wpa_supplicant/wpa_cli_cmds.c b/wpa_supplicant/wpa_cli_cmds.c
index 153e07a92..5c0d0b0f4 100644
--- a/wpa_supplicant/wpa_cli_cmds.c
+++ b/wpa_supplicant/wpa_cli_cmds.c
@@ -274,7 +274,7 @@ static int wpa_cli_cmd_disable_network(struct wpa_ctrl *ctrl, int argc,
 static int wpa_cli_cmd_add_network(struct wpa_ctrl *ctrl, int argc,
 				   char *argv[])
 {
-	return wpa_ctrl_command(ctrl, "ADD_NETWORK");
+	return wpa_cli_cmd(ctrl, "ADD_NETWORK", 0, argc, argv);
 }
 
 
@@ -288,19 +288,19 @@ static int wpa_cli_cmd_remove_network(struct wpa_ctrl *ctrl, int argc,
 static int wpa_cli_cmd_disconnect(struct wpa_ctrl *ctrl, int argc,
 				  char *argv[])
 {
-	return wpa_ctrl_command(ctrl, "DISCONNECT");
+	return wpa_cli_cmd(ctrl, "DISCONNECT", 0, argc, argv);
 }
 
 
 static int wpa_cli_cmd_status(struct wpa_ctrl *ctrl, int argc, char *argv[])
 {
 	if (argc > 0 && os_strcmp(argv[0], "verbose") == 0)
-		return wpa_ctrl_command(ctrl, "STATUS-VERBOSE");
+		return wpa_cli_cmd(ctrl, "STATUS-VERBOSE", 0, argc, argv);
 	if (argc > 0 && os_strcmp(argv[0], "wps") == 0)
-		return wpa_ctrl_command(ctrl, "STATUS-WPS");
+		return wpa_cli_cmd(ctrl, "STATUS-WPS", 0, argc, argv);
 	if (argc > 0 && os_strcmp(argv[0], "driver") == 0)
-		return wpa_ctrl_command(ctrl, "STATUS-DRIVER");
-	return wpa_ctrl_command(ctrl, "STATUS");
+		return wpa_cli_cmd(ctrl, "STATUS-DRIVER", 0, argc, argv);
+	return wpa_cli_cmd(ctrl, "STATUS", 0, argc, argv);
 }
 
 
@@ -333,7 +333,7 @@ static int wpa_cli_cmd_interface_add(struct wpa_ctrl *ctrl, int argc,
 	if (os_snprintf_error(sizeof(cmd), res))
 		return -1;
 	cmd[sizeof(cmd) - 1] = '\0';
-	return wpa_ctrl_command(ctrl, cmd);
+	return wpa_cli_cmd(ctrl, cmd, 0, argc, argv);
 }
 
 
@@ -347,7 +347,7 @@ static int wpa_cli_cmd_interface_remove(struct wpa_ctrl *ctrl, int argc,
 static int wpa_cli_cmd_interface_list(struct wpa_ctrl *ctrl, int argc,
 				      char *argv[])
 {
-	return wpa_ctrl_command(ctrl, "INTERFACE_LIST");
+	return wpa_cli_cmd(ctrl, "INTERFACE_LIST", 0, argc, argv);
 }