diff --git a/include/villas/api/session.h b/include/villas/api/session.h
index b4b59dd70..6506b774e 100644
--- a/include/villas/api/session.h
+++ b/include/villas/api/session.h
@@ -71,7 +71,7 @@ int api_session_init(struct api_session *s, enum api_mode m);
 
 int api_session_destroy(struct api_session *s);
 
-int api_session_run_command(struct api_session *s, json_t *req, json_t **resp);
+int api_session_run_action(struct api_session *s, json_t *req, json_t **resp);
 
 char * api_session_name(struct api_session *s);
 
diff --git a/lib/api.c b/lib/api.c
index 70c63731a..8f836dc17 100644
--- a/lib/api.c
+++ b/lib/api.c
@@ -367,7 +367,7 @@ static void * api_worker(void *ctx)
 
 		queue_pull(&s->request.queue, (void **) &req);
 
-		api_session_run_command(s, req, &resp);
+		api_session_run_action(s, req, &resp);
 
 		json_decref(req);
 
diff --git a/lib/api/session.c b/lib/api/session.c
index 68cd392a2..06392943d 100644
--- a/lib/api/session.c
+++ b/lib/api/session.c
@@ -81,7 +81,7 @@ int api_session_destroy(struct api_session *s)
 	return 0;
 }
 
-int api_session_run_command(struct api_session *s, json_t *json_in, json_t **json_out)
+int api_session_run_action(struct api_session *s, json_t *json_in, json_t **json_out)
 {
 	int ret;
 	const char *action;
@@ -110,7 +110,7 @@ int api_session_run_command(struct api_session *s, json_t *json_in, json_t **jso
 				"action", action,
 				"id", id,
 				"code", ret,
-				"error", "command not found");
+				"error", "action not found");
 		goto out;
 	}
 
@@ -122,7 +122,7 @@ int api_session_run_command(struct api_session *s, json_t *json_in, json_t **jso
 				"action", action,
 				"id", id,
 				"code", ret,
-				"error", "command failed");
+				"error", "action failed");
 	else
 		*json_out = json_pack("{ s: s, s: s }",
 				"action", action,