ari: User better nicknames for ARI operations

While working on building client libraries from the Swagger API, I
noticed a problem with the nicknames.

    channel.deleteChannel()
    channel.answerChannel()
    channel.muteChannel()

Etc. We put the object name in the nickname (since we were generating C
code), but it makes OO generators redundant.

This patch makes the nicknames more OO friendly. This resulted in a lot
of name changing within the res_ari_*.so modules, but not much else.

There were a couple of other fixed I made in the process.

 * When reversible operations (POST /hold, POST /unhold) were made more
   RESTful (POST /hold, DELETE /unhold), the path for the second operation
   was left in the API declaration. This worked, but really the two
   operations should have been on the same API.
 * The POST /unmute operation had still not been REST-ified.

Review: https://reviewboard.asterisk.org/r/2940/
........

Merged revisions 402528 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@402529 65c4cc65-6c06-0410-ace0-fbb531ad65f3

41 files changed, 614 insertions, 619 deletions

diff --git a/res/ari/resource_applications.c b/res/ari/resource_applications.c
index c422ad17f..aef939005 100644
--- a/res/ari/resource_applications.c
+++ b/res/ari/resource_applications.c
@@ -41,8 +41,8 @@ static int append_json(void *obj, void *arg, int flags)
 	return 0;
 }
 
-void ast_ari_get_applications(struct ast_variable *headers,
-	struct ast_get_applications_args *args,
+void ast_ari_applications_list(struct ast_variable *headers,
+	struct ast_ari_applications_list_args *args,
 	struct ast_ari_response *response)
 {
 	RAII_VAR(struct ao2_container *, apps, NULL, ao2_cleanup);
@@ -72,8 +72,8 @@ void ast_ari_get_applications(struct ast_variable *headers,
 	ast_ari_response_ok(response, json);
 }
 
-void ast_ari_get_application(struct ast_variable *headers,
-	struct ast_get_application_args *args,
+void ast_ari_applications_get(struct ast_variable *headers,
+	struct ast_ari_applications_get_args *args,
 	struct ast_ari_response *response)
 {
 	RAII_VAR(struct ast_json *, json, NULL, ast_json_unref);
@@ -89,8 +89,8 @@ void ast_ari_get_application(struct ast_variable *headers,
 	ast_ari_response_ok(response, json);
 }
 
-void ast_ari_application_subscribe(struct ast_variable *headers,
-	struct ast_application_subscribe_args *args,
+void ast_ari_applications_subscribe(struct ast_variable *headers,
+	struct ast_ari_applications_subscribe_args *args,
 	struct ast_ari_response *response)
 {
 	RAII_VAR(struct ast_json *, json, NULL, ast_json_unref);
@@ -134,8 +134,8 @@ void ast_ari_application_subscribe(struct ast_variable *headers,
 	}
 }
 
-void ast_ari_application_unsubscribe(struct ast_variable *headers,
-	struct ast_application_unsubscribe_args *args,
+void ast_ari_applications_unsubscribe(struct ast_variable *headers,
+	struct ast_ari_applications_unsubscribe_args *args,
 	struct ast_ari_response *response)
 {
 	RAII_VAR(struct ast_json *, json, NULL, ast_json_unref);
diff --git a/res/ari/resource_applications.h b/res/ari/resource_applications.h
index 34da3c194..12aacb330 100644
--- a/res/ari/resource_applications.h
+++ b/res/ari/resource_applications.h
@@ -39,8 +39,8 @@
 
 #include "asterisk/ari.h"
 
-/*! \brief Argument struct for ast_ari_get_applications() */
-struct ast_get_applications_args {
+/*! \brief Argument struct for ast_ari_applications_list() */
+struct ast_ari_applications_list_args {
 };
 /*!
  * \brief List all applications.
@@ -49,9 +49,9 @@ struct ast_get_applications_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_get_applications(struct ast_variable *headers, struct ast_get_applications_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_get_application() */
-struct ast_get_application_args {
+void ast_ari_applications_list(struct ast_variable *headers, struct ast_ari_applications_list_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_applications_get() */
+struct ast_ari_applications_get_args {
 	/*! \brief Application's name */
 	const char *application_name;
 };
@@ -62,9 +62,9 @@ struct ast_get_application_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_get_application(struct ast_variable *headers, struct ast_get_application_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_application_subscribe() */
-struct ast_application_subscribe_args {
+void ast_ari_applications_get(struct ast_variable *headers, struct ast_ari_applications_get_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_applications_subscribe() */
+struct ast_ari_applications_subscribe_args {
 	/*! \brief Application's name */
 	const char *application_name;
 	/*! \brief Array of URI for event source (channel:{channelId}, bridge:{bridgeId}, endpoint:{tech}/{resource} */
@@ -83,9 +83,9 @@ struct ast_application_subscribe_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_application_subscribe(struct ast_variable *headers, struct ast_application_subscribe_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_application_unsubscribe() */
-struct ast_application_unsubscribe_args {
+void ast_ari_applications_subscribe(struct ast_variable *headers, struct ast_ari_applications_subscribe_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_applications_unsubscribe() */
+struct ast_ari_applications_unsubscribe_args {
 	/*! \brief Application's name */
 	const char *application_name;
 	/*! \brief Array of URI for event source (channel:{channelId}, bridge:{bridgeId}, endpoint:{tech}/{resource} */
@@ -104,6 +104,6 @@ struct ast_application_unsubscribe_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_application_unsubscribe(struct ast_variable *headers, struct ast_application_unsubscribe_args *args, struct ast_ari_response *response);
+void ast_ari_applications_unsubscribe(struct ast_variable *headers, struct ast_ari_applications_unsubscribe_args *args, struct ast_ari_response *response);
 
 #endif /* _ASTERISK_RESOURCE_APPLICATIONS_H */
diff --git a/res/ari/resource_asterisk.c b/res/ari/resource_asterisk.c
index 268c07132..9871df4ff 100644
--- a/res/ari/resource_asterisk.c
+++ b/res/ari/resource_asterisk.c
@@ -37,8 +37,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "resource_asterisk.h"
 
-void ast_ari_get_asterisk_info(struct ast_variable *headers,
-	struct ast_get_asterisk_info_args *args,
+void ast_ari_asterisk_get_info(struct ast_variable *headers,
+	struct ast_ari_asterisk_get_info_args *args,
 	struct ast_ari_response *response)
 {
 	RAII_VAR(struct ast_json *, json, NULL, ast_json_unref);
@@ -140,7 +140,9 @@ void ast_ari_get_asterisk_info(struct ast_variable *headers,
 	ast_ari_response_ok(response, ast_json_ref(json));
 }
 
-void ast_ari_get_global_var(struct ast_variable *headers, struct ast_get_global_var_args *args, struct ast_ari_response *response)
+void ast_ari_asterisk_get_global_var(struct ast_variable *headers,
+	struct ast_ari_asterisk_get_global_var_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct ast_json *, json, NULL, ast_json_unref);
 	RAII_VAR(struct ast_str *, tmp, NULL, ast_free);
@@ -172,7 +174,9 @@ void ast_ari_get_global_var(struct ast_variable *headers, struct ast_get_global_
 	ast_ari_response_ok(response, ast_json_ref(json));
 }
 
-void ast_ari_set_global_var(struct ast_variable *headers, struct ast_set_global_var_args *args, struct ast_ari_response *response)
+void ast_ari_asterisk_set_global_var(struct ast_variable *headers,
+	struct ast_ari_asterisk_set_global_var_args *args,
+	struct ast_ari_response *response)
 {
 	ast_assert(response != NULL);
 
diff --git a/res/ari/resource_asterisk.h b/res/ari/resource_asterisk.h
index d2f316a6b..aff89c445 100644
--- a/res/ari/resource_asterisk.h
+++ b/res/ari/resource_asterisk.h
@@ -39,8 +39,8 @@
 
 #include "asterisk/ari.h"
 
-/*! \brief Argument struct for ast_ari_get_asterisk_info() */
-struct ast_get_asterisk_info_args {
+/*! \brief Argument struct for ast_ari_asterisk_get_info() */
+struct ast_ari_asterisk_get_info_args {
 	/*! \brief Array of Filter information returned */
 	const char **only;
 	/*! \brief Length of only array. */
@@ -55,9 +55,9 @@ struct ast_get_asterisk_info_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_get_asterisk_info(struct ast_variable *headers, struct ast_get_asterisk_info_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_get_global_var() */
-struct ast_get_global_var_args {
+void ast_ari_asterisk_get_info(struct ast_variable *headers, struct ast_ari_asterisk_get_info_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_asterisk_get_global_var() */
+struct ast_ari_asterisk_get_global_var_args {
 	/*! \brief The variable to get */
 	const char *variable;
 };
@@ -68,9 +68,9 @@ struct ast_get_global_var_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_get_global_var(struct ast_variable *headers, struct ast_get_global_var_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_set_global_var() */
-struct ast_set_global_var_args {
+void ast_ari_asterisk_get_global_var(struct ast_variable *headers, struct ast_ari_asterisk_get_global_var_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_asterisk_set_global_var() */
+struct ast_ari_asterisk_set_global_var_args {
 	/*! \brief The variable to set */
 	const char *variable;
 	/*! \brief The value to set the variable to */
@@ -83,6 +83,6 @@ struct ast_set_global_var_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_set_global_var(struct ast_variable *headers, struct ast_set_global_var_args *args, struct ast_ari_response *response);
+void ast_ari_asterisk_set_global_var(struct ast_variable *headers, struct ast_ari_asterisk_set_global_var_args *args, struct ast_ari_response *response);
 
 #endif /* _ASTERISK_RESOURCE_ASTERISK_H */
diff --git a/res/ari/resource_bridges.c b/res/ari/resource_bridges.c
index 919171139..7c4fed29b 100644
--- a/res/ari/resource_bridges.c
+++ b/res/ari/resource_bridges.c
@@ -172,7 +172,9 @@ static struct control_list *control_list_create(struct ast_ari_response *respons
 	return list;
 }
 
-void ast_ari_add_channel_to_bridge(struct ast_variable *headers, struct ast_add_channel_to_bridge_args *args, struct ast_ari_response *response)
+void ast_ari_bridges_add_channel(struct ast_variable *headers,
+	struct ast_ari_bridges_add_channel_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct ast_bridge *, bridge, find_bridge(response, args->bridge_id), ao2_cleanup);
 	RAII_VAR(struct control_list *, list, NULL, ao2_cleanup);
@@ -206,7 +208,9 @@ void ast_ari_add_channel_to_bridge(struct ast_variable *headers, struct ast_add_
 	ast_ari_response_no_content(response);
 }
 
-void ast_ari_remove_channel_from_bridge(struct ast_variable *headers, struct ast_remove_channel_from_bridge_args *args, struct ast_ari_response *response)
+void ast_ari_bridges_remove_channel(struct ast_variable *headers,
+	struct ast_ari_bridges_remove_channel_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct ast_bridge *, bridge, find_bridge(response, args->bridge_id), ao2_cleanup);
 	RAII_VAR(struct control_list *, list, NULL, ao2_cleanup);
@@ -290,7 +294,9 @@ static struct ast_channel *prepare_bridge_media_channel(const char *type)
 	return ast_request(type, cap, NULL, "ARI", NULL);
 }
 
-void ast_ari_play_on_bridge(struct ast_variable *headers, struct ast_play_on_bridge_args *args, struct ast_ari_response *response)
+void ast_ari_bridges_play(struct ast_variable *headers,
+	struct ast_ari_bridges_play_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct ast_bridge *, bridge, find_bridge(response, args->bridge_id), ao2_cleanup);
 	RAII_VAR(struct ast_channel *, play_channel, NULL, ast_hangup);
@@ -385,7 +391,9 @@ void ast_ari_play_on_bridge(struct ast_variable *headers, struct ast_play_on_bri
 	ast_ari_response_created(response, playback_url, json);
 }
 
-void ast_ari_record_bridge(struct ast_variable *headers, struct ast_record_bridge_args *args, struct ast_ari_response *response)
+void ast_ari_bridges_record(struct ast_variable *headers,
+	struct ast_ari_bridges_record_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct ast_bridge *, bridge, find_bridge(response, args->bridge_id), ao2_cleanup);
 	RAII_VAR(struct ast_channel *, record_channel, NULL, ast_hangup);
@@ -538,7 +546,9 @@ void ast_ari_record_bridge(struct ast_variable *headers, struct ast_record_bridg
 	ast_ari_response_created(response, recording_url, json);
 }
 
-void ast_ari_moh_start_bridge(struct ast_variable *headers, struct ast_moh_start_bridge_args *args, struct ast_ari_response *response)
+void ast_ari_bridges_start_moh(struct ast_variable *headers,
+	struct ast_ari_bridges_start_moh_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct ast_bridge *, bridge, find_bridge(response, args->bridge_id), ao2_cleanup);
 	struct ast_channel *moh_channel;
@@ -561,7 +571,9 @@ void ast_ari_moh_start_bridge(struct ast_variable *headers, struct ast_moh_start
 
 }
 
-void ast_ari_moh_stop_bridge(struct ast_variable *headers, struct ast_moh_stop_bridge_args *args, struct ast_ari_response *response)
+void ast_ari_bridges_stop_moh(struct ast_variable *headers,
+	struct ast_ari_bridges_stop_moh_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct ast_bridge *, bridge, find_bridge(response, args->bridge_id), ao2_cleanup);
 
@@ -580,7 +592,9 @@ void ast_ari_moh_stop_bridge(struct ast_variable *headers, struct ast_moh_stop_b
 	ast_ari_response_no_content(response);
 }
 
-void ast_ari_get_bridge(struct ast_variable *headers, struct ast_get_bridge_args *args, struct ast_ari_response *response)
+void ast_ari_bridges_get(struct ast_variable *headers,
+	struct ast_ari_bridges_get_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct ast_bridge_snapshot *, snapshot, ast_bridge_snapshot_get_latest(args->bridge_id), ao2_cleanup);
 	if (!snapshot) {
@@ -594,7 +608,9 @@ void ast_ari_get_bridge(struct ast_variable *headers, struct ast_get_bridge_args
 		ast_bridge_snapshot_to_json(snapshot));
 }
 
-void ast_ari_delete_bridge(struct ast_variable *headers, struct ast_delete_bridge_args *args, struct ast_ari_response *response)
+void ast_ari_bridges_destroy(struct ast_variable *headers,
+	struct ast_ari_bridges_destroy_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct ast_bridge *, bridge, find_bridge(response, args->bridge_id), ao2_cleanup);
 	if (!bridge) {
@@ -605,7 +621,9 @@ void ast_ari_delete_bridge(struct ast_variable *headers, struct ast_delete_bridg
 	ast_ari_response_no_content(response);
 }
 
-void ast_ari_get_bridges(struct ast_variable *headers, struct ast_get_bridges_args *args, struct ast_ari_response *response)
+void ast_ari_bridges_list(struct ast_variable *headers,
+	struct ast_ari_bridges_list_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct stasis_cache *, cache, NULL, ao2_cleanup);
 	RAII_VAR(struct ao2_container *, snapshots, NULL, ao2_cleanup);
@@ -648,7 +666,9 @@ void ast_ari_get_bridges(struct ast_variable *headers, struct ast_get_bridges_ar
 	ast_ari_response_ok(response, ast_json_ref(json));
 }
 
-void ast_ari_new_bridge(struct ast_variable *headers, struct ast_new_bridge_args *args, struct ast_ari_response *response)
+void ast_ari_bridges_create(struct ast_variable *headers,
+	struct ast_ari_bridges_create_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct ast_bridge *, bridge, stasis_app_bridge_create(args->type), ao2_cleanup);
 	RAII_VAR(struct ast_bridge_snapshot *, snapshot, NULL, ao2_cleanup);
diff --git a/res/ari/resource_bridges.h b/res/ari/resource_bridges.h
index abb372c1a..c5a832275 100644
--- a/res/ari/resource_bridges.h
+++ b/res/ari/resource_bridges.h
@@ -39,8 +39,8 @@
 
 #include "asterisk/ari.h"
 
-/*! \brief Argument struct for ast_ari_get_bridges() */
-struct ast_get_bridges_args {
+/*! \brief Argument struct for ast_ari_bridges_list() */
+struct ast_ari_bridges_list_args {
 };
 /*!
  * \brief List all active bridges in Asterisk.
@@ -49,9 +49,9 @@ struct ast_get_bridges_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_get_bridges(struct ast_variable *headers, struct ast_get_bridges_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_new_bridge() */
-struct ast_new_bridge_args {
+void ast_ari_bridges_list(struct ast_variable *headers, struct ast_ari_bridges_list_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_bridges_create() */
+struct ast_ari_bridges_create_args {
 	/*! \brief Type of bridge to create. */
 	const char *type;
 };
@@ -64,9 +64,9 @@ struct ast_new_bridge_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_new_bridge(struct ast_variable *headers, struct ast_new_bridge_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_get_bridge() */
-struct ast_get_bridge_args {
+void ast_ari_bridges_create(struct ast_variable *headers, struct ast_ari_bridges_create_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_bridges_get() */
+struct ast_ari_bridges_get_args {
 	/*! \brief Bridge's id */
 	const char *bridge_id;
 };
@@ -77,9 +77,9 @@ struct ast_get_bridge_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_get_bridge(struct ast_variable *headers, struct ast_get_bridge_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_delete_bridge() */
-struct ast_delete_bridge_args {
+void ast_ari_bridges_get(struct ast_variable *headers, struct ast_ari_bridges_get_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_bridges_destroy() */
+struct ast_ari_bridges_destroy_args {
 	/*! \brief Bridge's id */
 	const char *bridge_id;
 };
@@ -92,9 +92,9 @@ struct ast_delete_bridge_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_delete_bridge(struct ast_variable *headers, struct ast_delete_bridge_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_add_channel_to_bridge() */
-struct ast_add_channel_to_bridge_args {
+void ast_ari_bridges_destroy(struct ast_variable *headers, struct ast_ari_bridges_destroy_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_bridges_add_channel() */
+struct ast_ari_bridges_add_channel_args {
 	/*! \brief Bridge's id */
 	const char *bridge_id;
 	/*! \brief Array of Ids of channels to add to bridge */
@@ -113,9 +113,9 @@ struct ast_add_channel_to_bridge_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_add_channel_to_bridge(struct ast_variable *headers, struct ast_add_channel_to_bridge_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_remove_channel_from_bridge() */
-struct ast_remove_channel_from_bridge_args {
+void ast_ari_bridges_add_channel(struct ast_variable *headers, struct ast_ari_bridges_add_channel_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_bridges_remove_channel() */
+struct ast_ari_bridges_remove_channel_args {
 	/*! \brief Bridge's id */
 	const char *bridge_id;
 	/*! \brief Array of Ids of channels to remove from bridge */
@@ -132,9 +132,9 @@ struct ast_remove_channel_from_bridge_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_remove_channel_from_bridge(struct ast_variable *headers, struct ast_remove_channel_from_bridge_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_moh_start_bridge() */
-struct ast_moh_start_bridge_args {
+void ast_ari_bridges_remove_channel(struct ast_variable *headers, struct ast_ari_bridges_remove_channel_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_bridges_start_moh() */
+struct ast_ari_bridges_start_moh_args {
 	/*! \brief Bridge's id */
 	const char *bridge_id;
 	/*! \brief Channel's id */
@@ -147,24 +147,24 @@ struct ast_moh_start_bridge_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_moh_start_bridge(struct ast_variable *headers, struct ast_moh_start_bridge_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_moh_stop_bridge() */
-struct ast_moh_stop_bridge_args {
+void ast_ari_bridges_start_moh(struct ast_variable *headers, struct ast_ari_bridges_start_moh_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_bridges_stop_moh() */
+struct ast_ari_bridges_stop_moh_args {
 	/*! \brief Bridge's id */
 	const char *bridge_id;
 };
 /*!
  * \brief Stop playing music on hold to a bridge.
  *
- * This will only stop music on hold being played via bridges/{bridgeId}/mohStart.
+ * This will only stop music on hold being played via POST bridges/{bridgeId}/moh.
  *
  * \param headers HTTP headers
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_moh_stop_bridge(struct ast_variable *headers, struct ast_moh_stop_bridge_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_play_on_bridge() */
-struct ast_play_on_bridge_args {
+void ast_ari_bridges_stop_moh(struct ast_variable *headers, struct ast_ari_bridges_stop_moh_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_bridges_play() */
+struct ast_ari_bridges_play_args {
 	/*! \brief Bridge's id */
 	const char *bridge_id;
 	/*! \brief Media's URI to play. */
@@ -185,9 +185,9 @@ struct ast_play_on_bridge_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_play_on_bridge(struct ast_variable *headers, struct ast_play_on_bridge_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_record_bridge() */
-struct ast_record_bridge_args {
+void ast_ari_bridges_play(struct ast_variable *headers, struct ast_ari_bridges_play_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_bridges_record() */
+struct ast_ari_bridges_record_args {
 	/*! \brief Bridge's id */
 	const char *bridge_id;
 	/*! \brief Recording's filename */
@@ -214,6 +214,6 @@ struct ast_record_bridge_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_record_bridge(struct ast_variable *headers, struct ast_record_bridge_args *args, struct ast_ari_response *response);
+void ast_ari_bridges_record(struct ast_variable *headers, struct ast_ari_bridges_record_args *args, struct ast_ari_response *response);
 
 #endif /* _ASTERISK_RESOURCE_BRIDGES_H */
diff --git a/res/ari/resource_channels.c b/res/ari/resource_channels.c
index 482e4baa7..2b09a3281 100644
--- a/res/ari/resource_channels.c
+++ b/res/ari/resource_channels.c
@@ -81,9 +81,9 @@ static struct stasis_app_control *find_control(
 	return control;
 }
 
-void ast_ari_continue_in_dialplan(
+void ast_ari_channels_continue_in_dialplan(
 	struct ast_variable *headers,
-	struct ast_continue_in_dialplan_args *args,
+	struct ast_ari_channels_continue_in_dialplan_args *args,
 	struct ast_ari_response *response)
 {
 	RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
@@ -103,9 +103,9 @@ void ast_ari_continue_in_dialplan(
 	ast_ari_response_no_content(response);
 }
 
-void ast_ari_answer_channel(struct ast_variable *headers,
-				struct ast_answer_channel_args *args,
-				struct ast_ari_response *response)
+void ast_ari_channels_answer(struct ast_variable *headers,
+	struct ast_ari_channels_answer_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
 
@@ -124,9 +124,9 @@ void ast_ari_answer_channel(struct ast_variable *headers,
 	ast_ari_response_no_content(response);
 }
 
-void ast_ari_ring_channel(struct ast_variable *headers,
-				struct ast_ring_channel_args *args,
-				struct ast_ari_response *response)
+void ast_ari_channels_ring(struct ast_variable *headers,
+	struct ast_ari_channels_ring_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
 
@@ -140,7 +140,9 @@ void ast_ari_ring_channel(struct ast_variable *headers,
 	ast_ari_response_no_content(response);
 }
 
-void ast_ari_mute_channel(struct ast_variable *headers, struct ast_mute_channel_args *args, struct ast_ari_response *response)
+void ast_ari_channels_mute(struct ast_variable *headers,
+	struct ast_ari_channels_mute_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
 	unsigned int direction = 0;
@@ -176,7 +178,9 @@ void ast_ari_mute_channel(struct ast_variable *headers, struct ast_mute_channel_
 	ast_ari_response_no_content(response);
 }
 
-void ast_ari_unmute_channel(struct ast_variable *headers, struct ast_unmute_channel_args *args, struct ast_ari_response *response)
+void ast_ari_channels_unmute(struct ast_variable *headers,
+	struct ast_ari_channels_unmute_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
 	unsigned int direction = 0;
@@ -212,7 +216,9 @@ void ast_ari_unmute_channel(struct ast_variable *headers, struct ast_unmute_chan
 	ast_ari_response_no_content(response);
 }
 
-void ast_ari_send_dtmfchannel(struct ast_variable *headers, struct ast_send_dtmfchannel_args *args, struct ast_ari_response *response)
+void ast_ari_channels_send_dtmf(struct ast_variable *headers,
+	struct ast_ari_channels_send_dtmf_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
 
@@ -233,7 +239,9 @@ void ast_ari_send_dtmfchannel(struct ast_variable *headers, struct ast_send_dtmf
 	ast_ari_response_no_content(response);
 }
 
-void ast_ari_hold_channel(struct ast_variable *headers, struct ast_hold_channel_args *args, struct ast_ari_response *response)
+void ast_ari_channels_hold(struct ast_variable *headers,
+	struct ast_ari_channels_hold_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
 
@@ -248,7 +256,9 @@ void ast_ari_hold_channel(struct ast_variable *headers, struct ast_hold_channel_
 	ast_ari_response_no_content(response);
 }
 
-void ast_ari_unhold_channel(struct ast_variable *headers, struct ast_unhold_channel_args *args, struct ast_ari_response *response)
+void ast_ari_channels_unhold(struct ast_variable *headers,
+	struct ast_ari_channels_unhold_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
 
@@ -263,7 +273,9 @@ void ast_ari_unhold_channel(struct ast_variable *headers, struct ast_unhold_chan
 	ast_ari_response_no_content(response);
 }
 
-void ast_ari_moh_start_channel(struct ast_variable *headers, struct ast_moh_start_channel_args *args, struct ast_ari_response *response)
+void ast_ari_channels_start_moh(struct ast_variable *headers,
+	struct ast_ari_channels_start_moh_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
 
@@ -277,7 +289,9 @@ void ast_ari_moh_start_channel(struct ast_variable *headers, struct ast_moh_star
 	ast_ari_response_no_content(response);
 }
 
-void ast_ari_moh_stop_channel(struct ast_variable *headers, struct ast_moh_stop_channel_args *args, struct ast_ari_response *response)
+void ast_ari_channels_stop_moh(struct ast_variable *headers,
+	struct ast_ari_channels_stop_moh_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
 
@@ -291,8 +305,8 @@ void ast_ari_moh_stop_channel(struct ast_variable *headers, struct ast_moh_stop_
 	ast_ari_response_no_content(response);
 }
 
-void ast_ari_play_on_channel(struct ast_variable *headers,
-	struct ast_play_on_channel_args *args,
+void ast_ari_channels_play(struct ast_variable *headers,
+	struct ast_ari_channels_play_args *args,
 	struct ast_ari_response *response)
 {
 	RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
@@ -363,8 +377,8 @@ void ast_ari_play_on_channel(struct ast_variable *headers,
 	ast_ari_response_created(response, playback_url, json);
 }
 
-void ast_ari_record_channel(struct ast_variable *headers,
-	struct ast_record_channel_args *args,
+void ast_ari_channels_record(struct ast_variable *headers,
+	struct ast_ari_channels_record_args *args,
 	struct ast_ari_response *response)
 {
 	RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
@@ -502,9 +516,9 @@ void ast_ari_record_channel(struct ast_variable *headers,
 	ast_ari_response_created(response, recording_url, json);
 }
 
-void ast_ari_get_channel(struct ast_variable *headers,
-			     struct ast_get_channel_args *args,
-			     struct ast_ari_response *response)
+void ast_ari_channels_get(struct ast_variable *headers,
+	struct ast_ari_channels_get_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct stasis_message *, msg, NULL, ao2_cleanup);
 	struct stasis_cache *cache;
@@ -534,9 +548,9 @@ void ast_ari_get_channel(struct ast_variable *headers,
 				ast_channel_snapshot_to_json(snapshot));
 }
 
-void ast_ari_delete_channel(struct ast_variable *headers,
-				struct ast_delete_channel_args *args,
-				struct ast_ari_response *response)
+void ast_ari_channels_hangup(struct ast_variable *headers,
+	struct ast_ari_channels_hangup_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct ast_channel *, chan, NULL, ao2_cleanup);
 	int cause;
@@ -568,9 +582,9 @@ void ast_ari_delete_channel(struct ast_variable *headers,
 	ast_ari_response_no_content(response);
 }
 
-void ast_ari_get_channels(struct ast_variable *headers,
-			      struct ast_get_channels_args *args,
-			      struct ast_ari_response *response)
+void ast_ari_channels_list(struct ast_variable *headers,
+	struct ast_ari_channels_list_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct stasis_cache *, cache, NULL, ao2_cleanup);
 	RAII_VAR(struct ao2_container *, snapshots, NULL, ao2_cleanup);
@@ -615,9 +629,9 @@ void ast_ari_get_channels(struct ast_variable *headers,
 	ast_ari_response_ok(response, ast_json_ref(json));
 }
 
-void ast_ari_originate(struct ast_variable *headers,
-			   struct ast_originate_args *args,
-			   struct ast_ari_response *response)
+void ast_ari_channels_originate(struct ast_variable *headers,
+	struct ast_ari_channels_originate_args *args,
+	struct ast_ari_response *response)
 {
 	char *dialtech;
 	char dialdevice[AST_CHANNEL_NAME];
@@ -711,7 +725,9 @@ void ast_ari_originate(struct ast_variable *headers,
 	ast_channel_unref(chan);
 }
 
-void ast_ari_get_channel_var(struct ast_variable *headers, struct ast_get_channel_var_args *args, struct ast_ari_response *response)
+void ast_ari_channels_get_channel_var(struct ast_variable *headers,
+	struct ast_ari_channels_get_channel_var_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct ast_json *, json, NULL, ast_json_unref);
 	RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
@@ -742,7 +758,9 @@ void ast_ari_get_channel_var(struct ast_variable *headers, struct ast_get_channe
 	ast_ari_response_ok(response, ast_json_ref(json));
 }
 
-void ast_ari_set_channel_var(struct ast_variable *headers, struct ast_set_channel_var_args *args, struct ast_ari_response *response)
+void ast_ari_channels_set_channel_var(struct ast_variable *headers,
+	struct ast_ari_channels_set_channel_var_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup);
 
diff --git a/res/ari/resource_channels.h b/res/ari/resource_channels.h
index 02ad1a8cc..089f3fa7a 100644
--- a/res/ari/resource_channels.h
+++ b/res/ari/resource_channels.h
@@ -39,8 +39,8 @@
 
 #include "asterisk/ari.h"
 
-/*! \brief Argument struct for ast_ari_get_channels() */
-struct ast_get_channels_args {
+/*! \brief Argument struct for ast_ari_channels_list() */
+struct ast_ari_channels_list_args {
 };
 /*!
  * \brief List all active channels in Asterisk.
@@ -49,9 +49,9 @@ struct ast_get_channels_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_get_channels(struct ast_variable *headers, struct ast_get_channels_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_originate() */
-struct ast_originate_args {
+void ast_ari_channels_list(struct ast_variable *headers, struct ast_ari_channels_list_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_channels_originate() */
+struct ast_ari_channels_originate_args {
 	/*! \brief Endpoint to call. */
 	const char *endpoint;
 	/*! \brief The extension to dial after the endpoint answers */
@@ -78,9 +78,9 @@ struct ast_originate_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_originate(struct ast_variable *headers, struct ast_originate_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_get_channel() */
-struct ast_get_channel_args {
+void ast_ari_channels_originate(struct ast_variable *headers, struct ast_ari_channels_originate_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_channels_get() */
+struct ast_ari_channels_get_args {
 	/*! \brief Channel's id */
 	const char *channel_id;
 };
@@ -91,9 +91,9 @@ struct ast_get_channel_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_get_channel(struct ast_variable *headers, struct ast_get_channel_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_delete_channel() */
-struct ast_delete_channel_args {
+void ast_ari_channels_get(struct ast_variable *headers, struct ast_ari_channels_get_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_channels_hangup() */
+struct ast_ari_channels_hangup_args {
 	/*! \brief Channel's id */
 	const char *channel_id;
 	/*! \brief Reason for hanging up the channel */
@@ -106,9 +106,9 @@ struct ast_delete_channel_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_delete_channel(struct ast_variable *headers, struct ast_delete_channel_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_continue_in_dialplan() */
-struct ast_continue_in_dialplan_args {
+void ast_ari_channels_hangup(struct ast_variable *headers, struct ast_ari_channels_hangup_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_channels_continue_in_dialplan() */
+struct ast_ari_channels_continue_in_dialplan_args {
 	/*! \brief Channel's id */
 	const char *channel_id;
 	/*! \brief The context to continue to. */
@@ -125,9 +125,9 @@ struct ast_continue_in_dialplan_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_continue_in_dialplan(struct ast_variable *headers, struct ast_continue_in_dialplan_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_answer_channel() */
-struct ast_answer_channel_args {
+void ast_ari_channels_continue_in_dialplan(struct ast_variable *headers, struct ast_ari_channels_continue_in_dialplan_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_channels_answer() */
+struct ast_ari_channels_answer_args {
 	/*! \brief Channel's id */
 	const char *channel_id;
 };
@@ -138,9 +138,9 @@ struct ast_answer_channel_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_answer_channel(struct ast_variable *headers, struct ast_answer_channel_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_ring_channel() */
-struct ast_ring_channel_args {
+void ast_ari_channels_answer(struct ast_variable *headers, struct ast_ari_channels_answer_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_channels_ring() */
+struct ast_ari_channels_ring_args {
 	/*! \brief Channel's id */
 	const char *channel_id;
 };
@@ -151,9 +151,9 @@ struct ast_ring_channel_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_ring_channel(struct ast_variable *headers, struct ast_ring_channel_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_send_dtmfchannel() */
-struct ast_send_dtmfchannel_args {
+void ast_ari_channels_ring(struct ast_variable *headers, struct ast_ari_channels_ring_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_channels_send_dtmf() */
+struct ast_ari_channels_send_dtmf_args {
 	/*! \brief Channel's id */
 	const char *channel_id;
 	/*! \brief DTMF To send. */
@@ -174,9 +174,9 @@ struct ast_send_dtmfchannel_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_send_dtmfchannel(struct ast_variable *headers, struct ast_send_dtmfchannel_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_mute_channel() */
-struct ast_mute_channel_args {
+void ast_ari_channels_send_dtmf(struct ast_variable *headers, struct ast_ari_channels_send_dtmf_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_channels_mute() */
+struct ast_ari_channels_mute_args {
 	/*! \brief Channel's id */
 	const char *channel_id;
 	/*! \brief Direction in which to mute audio */
@@ -189,9 +189,9 @@ struct ast_mute_channel_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_mute_channel(struct ast_variable *headers, struct ast_mute_channel_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_unmute_channel() */
-struct ast_unmute_channel_args {
+void ast_ari_channels_mute(struct ast_variable *headers, struct ast_ari_channels_mute_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_channels_unmute() */
+struct ast_ari_channels_unmute_args {
 	/*! \brief Channel's id */
 	const char *channel_id;
 	/*! \brief Direction in which to unmute audio */
@@ -204,9 +204,9 @@ struct ast_unmute_channel_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_unmute_channel(struct ast_variable *headers, struct ast_unmute_channel_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_hold_channel() */
-struct ast_hold_channel_args {
+void ast_ari_channels_unmute(struct ast_variable *headers, struct ast_ari_channels_unmute_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_channels_hold() */
+struct ast_ari_channels_hold_args {
 	/*! \brief Channel's id */
 	const char *channel_id;
 };
@@ -217,9 +217,9 @@ struct ast_hold_channel_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_hold_channel(struct ast_variable *headers, struct ast_hold_channel_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_unhold_channel() */
-struct ast_unhold_channel_args {
+void ast_ari_channels_hold(struct ast_variable *headers, struct ast_ari_channels_hold_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_channels_unhold() */
+struct ast_ari_channels_unhold_args {
 	/*! \brief Channel's id */
 	const char *channel_id;
 };
@@ -230,9 +230,9 @@ struct ast_unhold_channel_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_unhold_channel(struct ast_variable *headers, struct ast_unhold_channel_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_moh_start_channel() */
-struct ast_moh_start_channel_args {
+void ast_ari_channels_unhold(struct ast_variable *headers, struct ast_ari_channels_unhold_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_channels_start_moh() */
+struct ast_ari_channels_start_moh_args {
 	/*! \brief Channel's id */
 	const char *channel_id;
 	/*! \brief Music on hold class to use */
@@ -247,9 +247,9 @@ struct ast_moh_start_channel_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_moh_start_channel(struct ast_variable *headers, struct ast_moh_start_channel_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_moh_stop_channel() */
-struct ast_moh_stop_channel_args {
+void ast_ari_channels_start_moh(struct ast_variable *headers, struct ast_ari_channels_start_moh_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_channels_stop_moh() */
+struct ast_ari_channels_stop_moh_args {
 	/*! \brief Channel's id */
 	const char *channel_id;
 };
@@ -260,9 +260,9 @@ struct ast_moh_stop_channel_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_moh_stop_channel(struct ast_variable *headers, struct ast_moh_stop_channel_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_play_on_channel() */
-struct ast_play_on_channel_args {
+void ast_ari_channels_stop_moh(struct ast_variable *headers, struct ast_ari_channels_stop_moh_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_channels_play() */
+struct ast_ari_channels_play_args {
 	/*! \brief Channel's id */
 	const char *channel_id;
 	/*! \brief Media's URI to play. */
@@ -283,9 +283,9 @@ struct ast_play_on_channel_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_play_on_channel(struct ast_variable *headers, struct ast_play_on_channel_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_record_channel() */
-struct ast_record_channel_args {
+void ast_ari_channels_play(struct ast_variable *headers, struct ast_ari_channels_play_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_channels_record() */
+struct ast_ari_channels_record_args {
 	/*! \brief Channel's id */
 	const char *channel_id;
 	/*! \brief Recording's filename */
@@ -312,9 +312,9 @@ struct ast_record_channel_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_record_channel(struct ast_variable *headers, struct ast_record_channel_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_get_channel_var() */
-struct ast_get_channel_var_args {
+void ast_ari_channels_record(struct ast_variable *headers, struct ast_ari_channels_record_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_channels_get_channel_var() */
+struct ast_ari_channels_get_channel_var_args {
 	/*! \brief Channel's id */
 	const char *channel_id;
 	/*! \brief The channel variable or function to get */
@@ -327,9 +327,9 @@ struct ast_get_channel_var_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_get_channel_var(struct ast_variable *headers, struct ast_get_channel_var_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_set_channel_var() */
-struct ast_set_channel_var_args {
+void ast_ari_channels_get_channel_var(struct ast_variable *headers, struct ast_ari_channels_get_channel_var_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_channels_set_channel_var() */
+struct ast_ari_channels_set_channel_var_args {
 	/*! \brief Channel's id */
 	const char *channel_id;
 	/*! \brief The channel variable or function to set */
@@ -344,6 +344,6 @@ struct ast_set_channel_var_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_set_channel_var(struct ast_variable *headers, struct ast_set_channel_var_args *args, struct ast_ari_response *response);
+void ast_ari_channels_set_channel_var(struct ast_variable *headers, struct ast_ari_channels_set_channel_var_args *args, struct ast_ari_response *response);
 
 #endif /* _ASTERISK_RESOURCE_CHANNELS_H */
diff --git a/res/ari/resource_endpoints.c b/res/ari/resource_endpoints.c
index caf20cb28..181ce7a50 100644
--- a/res/ari/resource_endpoints.c
+++ b/res/ari/resource_endpoints.c
@@ -33,8 +33,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/stasis.h"
 #include "asterisk/stasis_endpoints.h"
 
-void ast_ari_get_endpoints(struct ast_variable *headers,
-	struct ast_get_endpoints_args *args,
+void ast_ari_endpoints_list(struct ast_variable *headers,
+	struct ast_ari_endpoints_list_args *args,
 	struct ast_ari_response *response)
 {
 	RAII_VAR(struct stasis_cache *, cache, NULL, ao2_cleanup);
@@ -79,8 +79,8 @@ void ast_ari_get_endpoints(struct ast_variable *headers,
 
 	ast_ari_response_ok(response, ast_json_ref(json));
 }
-void ast_ari_get_endpoints_by_tech(struct ast_variable *headers,
-	struct ast_get_endpoints_by_tech_args *args,
+void ast_ari_endpoints_list_by_tech(struct ast_variable *headers,
+	struct ast_ari_endpoints_list_by_tech_args *args,
 	struct ast_ari_response *response)
 {
 	RAII_VAR(struct stasis_cache *, cache, NULL, ao2_cleanup);
@@ -133,8 +133,8 @@ void ast_ari_get_endpoints_by_tech(struct ast_variable *headers,
 
 	ast_ari_response_ok(response, ast_json_ref(json));
 }
-void ast_ari_get_endpoint(struct ast_variable *headers,
-	struct ast_get_endpoint_args *args,
+void ast_ari_endpoints_get(struct ast_variable *headers,
+	struct ast_ari_endpoints_get_args *args,
 	struct ast_ari_response *response)
 {
 	RAII_VAR(struct ast_json *, json, NULL, ast_json_unref);
diff --git a/res/ari/resource_endpoints.h b/res/ari/resource_endpoints.h
index 5d7aade68..1454a73c9 100644
--- a/res/ari/resource_endpoints.h
+++ b/res/ari/resource_endpoints.h
@@ -39,8 +39,8 @@
 
 #include "asterisk/ari.h"
 
-/*! \brief Argument struct for ast_ari_get_endpoints() */
-struct ast_get_endpoints_args {
+/*! \brief Argument struct for ast_ari_endpoints_list() */
+struct ast_ari_endpoints_list_args {
 };
 /*!
  * \brief List all endpoints.
@@ -49,9 +49,9 @@ struct ast_get_endpoints_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_get_endpoints(struct ast_variable *headers, struct ast_get_endpoints_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_get_endpoints_by_tech() */
-struct ast_get_endpoints_by_tech_args {
+void ast_ari_endpoints_list(struct ast_variable *headers, struct ast_ari_endpoints_list_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_endpoints_list_by_tech() */
+struct ast_ari_endpoints_list_by_tech_args {
 	/*! \brief Technology of the endpoints (sip,iax2,...) */
 	const char *tech;
 };
@@ -62,9 +62,9 @@ struct ast_get_endpoints_by_tech_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_get_endpoints_by_tech(struct ast_variable *headers, struct ast_get_endpoints_by_tech_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_get_endpoint() */
-struct ast_get_endpoint_args {
+void ast_ari_endpoints_list_by_tech(struct ast_variable *headers, struct ast_ari_endpoints_list_by_tech_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_endpoints_get() */
+struct ast_ari_endpoints_get_args {
 	/*! \brief Technology of the endpoint */
 	const char *tech;
 	/*! \brief ID of the endpoint */
@@ -77,6 +77,6 @@ struct ast_get_endpoint_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_get_endpoint(struct ast_variable *headers, struct ast_get_endpoint_args *args, struct ast_ari_response *response);
+void ast_ari_endpoints_get(struct ast_variable *headers, struct ast_ari_endpoints_get_args *args, struct ast_ari_response *response);
 
 #endif /* _ASTERISK_RESOURCE_ENDPOINTS_H */
diff --git a/res/ari/resource_events.c b/res/ari/resource_events.c
index dd474c3ce..098049fc6 100644
--- a/res/ari/resource_events.c
+++ b/res/ari/resource_events.c
@@ -168,9 +168,9 @@ static int session_register_app(struct event_session *session,
 	return 0;
 }
 
-void ast_ari_websocket_event_websocket(struct ast_ari_websocket_session *ws_session,
+void ast_ari_websocket_events_event_websocket(struct ast_ari_websocket_session *ws_session,
 	struct ast_variable *headers,
-	struct ast_event_websocket_args *args)
+	struct ast_ari_events_event_websocket_args *args)
 {
 	RAII_VAR(struct event_session *, session, NULL, session_cleanup);
 	struct ast_json *msg;
diff --git a/res/ari/resource_events.h b/res/ari/resource_events.h
index ac7600e03..96ee5b3ac 100644
--- a/res/ari/resource_events.h
+++ b/res/ari/resource_events.h
@@ -39,8 +39,8 @@
 
 #include "asterisk/ari.h"
 
-/*! \brief Argument struct for ast_ari_event_websocket() */
-struct ast_event_websocket_args {
+/*! \brief Argument struct for ast_ari_events_event_websocket() */
+struct ast_ari_events_event_websocket_args {
 	/*! \brief Array of Applications to subscribe to. */
 	const char **app;
 	/*! \brief Length of app array. */
@@ -55,6 +55,6 @@ struct ast_event_websocket_args {
  * \param headers HTTP headers.
  * \param args Swagger parameters.
  */
-void ast_ari_websocket_event_websocket(struct ast_ari_websocket_session *session, struct ast_variable *headers, struct ast_event_websocket_args *args);
+void ast_ari_websocket_events_event_websocket(struct ast_ari_websocket_session *session, struct ast_variable *headers, struct ast_ari_events_event_websocket_args *args);
 
 #endif /* _ASTERISK_RESOURCE_EVENTS_H */
diff --git a/res/ari/resource_playback.c b/res/ari/resource_playback.c
index 7cb1d281c..30445ef93 100644
--- a/res/ari/resource_playback.c
+++ b/res/ari/resource_playback.c
@@ -30,8 +30,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/stasis_app_playback.h"
 #include "resource_playback.h"
 
-void ast_ari_get_playback(struct ast_variable *headers,
-	struct ast_get_playback_args *args,
+void ast_ari_playback_get(struct ast_variable *headers,
+	struct ast_ari_playback_get_args *args,
 	struct ast_ari_response *response)
 {
 	RAII_VAR(struct stasis_app_playback *, playback, NULL, ao2_cleanup);
@@ -53,8 +53,8 @@ void ast_ari_get_playback(struct ast_variable *headers,
 
 	ast_ari_response_ok(response, ast_json_ref(json));
 }
-void ast_ari_stop_playback(struct ast_variable *headers,
-	struct ast_stop_playback_args *args,
+void ast_ari_playback_stop(struct ast_variable *headers,
+	struct ast_ari_playback_stop_args *args,
 	struct ast_ari_response *response)
 {
 	RAII_VAR(struct stasis_app_playback *, playback, NULL, ao2_cleanup);
@@ -84,8 +84,8 @@ void ast_ari_stop_playback(struct ast_variable *headers,
 		return;
 	}
 }
-void ast_ari_control_playback(struct ast_variable *headers,
-	struct ast_control_playback_args *args,
+void ast_ari_playback_control(struct ast_variable *headers,
+	struct ast_ari_playback_control_args *args,
 	struct ast_ari_response *response)
 {
 	RAII_VAR(struct stasis_app_playback *, playback, NULL, ao2_cleanup);
diff --git a/res/ari/resource_playback.h b/res/ari/resource_playback.h
index 719997a00..e3a5c5526 100644
--- a/res/ari/resource_playback.h
+++ b/res/ari/resource_playback.h
@@ -39,8 +39,8 @@
 
 #include "asterisk/ari.h"
 
-/*! \brief Argument struct for ast_ari_get_playback() */
-struct ast_get_playback_args {
+/*! \brief Argument struct for ast_ari_playback_get() */
+struct ast_ari_playback_get_args {
 	/*! \brief Playback's id */
 	const char *playback_id;
 };
@@ -51,9 +51,9 @@ struct ast_get_playback_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_get_playback(struct ast_variable *headers, struct ast_get_playback_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_stop_playback() */
-struct ast_stop_playback_args {
+void ast_ari_playback_get(struct ast_variable *headers, struct ast_ari_playback_get_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_playback_stop() */
+struct ast_ari_playback_stop_args {
 	/*! \brief Playback's id */
 	const char *playback_id;
 };
@@ -64,9 +64,9 @@ struct ast_stop_playback_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_stop_playback(struct ast_variable *headers, struct ast_stop_playback_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_control_playback() */
-struct ast_control_playback_args {
+void ast_ari_playback_stop(struct ast_variable *headers, struct ast_ari_playback_stop_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_playback_control() */
+struct ast_ari_playback_control_args {
 	/*! \brief Playback's id */
 	const char *playback_id;
 	/*! \brief Operation to perform on the playback. */
@@ -79,6 +79,6 @@ struct ast_control_playback_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_control_playback(struct ast_variable *headers, struct ast_control_playback_args *args, struct ast_ari_response *response);
+void ast_ari_playback_control(struct ast_variable *headers, struct ast_ari_playback_control_args *args, struct ast_ari_response *response);
 
 #endif /* _ASTERISK_RESOURCE_PLAYBACK_H */
diff --git a/res/ari/resource_recordings.c b/res/ari/resource_recordings.c
index d6803469f..418e3be63 100644
--- a/res/ari/resource_recordings.c
+++ b/res/ari/resource_recordings.c
@@ -30,8 +30,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/stasis_app_recording.h"
 #include "resource_recordings.h"
 
-void ast_ari_get_stored_recordings(struct ast_variable *headers,
-	struct ast_get_stored_recordings_args *args,
+void ast_ari_recordings_list_stored(struct ast_variable *headers,
+	struct ast_ari_recordings_list_stored_args *args,
 	struct ast_ari_response *response)
 {
 	RAII_VAR(struct ao2_container *, recordings, NULL, ao2_cleanup);
@@ -70,8 +70,8 @@ void ast_ari_get_stored_recordings(struct ast_variable *headers,
 	ast_ari_response_ok(response, ast_json_ref(json));
 }
 
-void ast_ari_get_stored_recording(struct ast_variable *headers,
-	struct ast_get_stored_recording_args *args,
+void ast_ari_recordings_get_stored(struct ast_variable *headers,
+	struct ast_ari_recordings_get_stored_args *args,
 	struct ast_ari_response *response)
 {
 	RAII_VAR(struct stasis_app_stored_recording *, recording, NULL,
@@ -96,8 +96,8 @@ void ast_ari_get_stored_recording(struct ast_variable *headers,
 	ast_ari_response_ok(response, ast_json_ref(json));
 }
 
-void ast_ari_delete_stored_recording(struct ast_variable *headers,
-	struct ast_delete_stored_recording_args *args,
+void ast_ari_recordings_delete_stored(struct ast_variable *headers,
+	struct ast_ari_recordings_delete_stored_args *args,
 	struct ast_ari_response *response)
 {
 	RAII_VAR(struct stasis_app_stored_recording *, recording, NULL,
@@ -137,8 +137,8 @@ void ast_ari_delete_stored_recording(struct ast_variable *headers,
 	ast_ari_response_no_content(response);
 }
 
-void ast_ari_get_live_recording(struct ast_variable *headers,
-	struct ast_get_live_recording_args *args,
+void ast_ari_recordings_get_live(struct ast_variable *headers,
+	struct ast_ari_recordings_get_live_args *args,
 	struct ast_ari_response *response)
 {
 	RAII_VAR(struct stasis_app_recording *, recording, NULL, ao2_cleanup);
@@ -192,48 +192,48 @@ static void control_recording(const char *name,
 	}
 }
 
-void ast_ari_cancel_recording(struct ast_variable *headers,
-	struct ast_cancel_recording_args *args,
+void ast_ari_recordings_cancel(struct ast_variable *headers,
+	struct ast_ari_recordings_cancel_args *args,
 	struct ast_ari_response *response)
 {
 	control_recording(args->recording_name, STASIS_APP_RECORDING_CANCEL,
 		response);
 }
 
-void ast_ari_stop_recording(struct ast_variable *headers,
-	struct ast_stop_recording_args *args,
+void ast_ari_recordings_stop(struct ast_variable *headers,
+	struct ast_ari_recordings_stop_args *args,
 	struct ast_ari_response *response)
 {
 	control_recording(args->recording_name, STASIS_APP_RECORDING_STOP,
 		response);
 }
 
-void ast_ari_pause_recording(struct ast_variable *headers,
-	struct ast_pause_recording_args *args,
+void ast_ari_recordings_pause(struct ast_variable *headers,
+	struct ast_ari_recordings_pause_args *args,
 	struct ast_ari_response *response)
 {
 	control_recording(args->recording_name, STASIS_APP_RECORDING_PAUSE,
 		response);
 }
 
-void ast_ari_unpause_recording(struct ast_variable *headers,
-	struct ast_unpause_recording_args *args,
+void ast_ari_recordings_unpause(struct ast_variable *headers,
+	struct ast_ari_recordings_unpause_args *args,
 	struct ast_ari_response *response)
 {
 	control_recording(args->recording_name, STASIS_APP_RECORDING_UNPAUSE,
 		response);
 }
 
-void ast_ari_mute_recording(struct ast_variable *headers,
-	struct ast_mute_recording_args *args,
+void ast_ari_recordings_mute(struct ast_variable *headers,
+	struct ast_ari_recordings_mute_args *args,
 	struct ast_ari_response *response)
 {
 	control_recording(args->recording_name, STASIS_APP_RECORDING_MUTE,
 		response);
 }
 
-void ast_ari_unmute_recording(struct ast_variable *headers,
-	struct ast_unmute_recording_args *args,
+void ast_ari_recordings_unmute(struct ast_variable *headers,
+	struct ast_ari_recordings_unmute_args *args,
 	struct ast_ari_response *response)
 {
 	control_recording(args->recording_name, STASIS_APP_RECORDING_UNMUTE,
diff --git a/res/ari/resource_recordings.h b/res/ari/resource_recordings.h
index 682b45c56..676d8ab80 100644
--- a/res/ari/resource_recordings.h
+++ b/res/ari/resource_recordings.h
@@ -39,8 +39,8 @@
 
 #include "asterisk/ari.h"
 
-/*! \brief Argument struct for ast_ari_get_stored_recordings() */
-struct ast_get_stored_recordings_args {
+/*! \brief Argument struct for ast_ari_recordings_list_stored() */
+struct ast_ari_recordings_list_stored_args {
 };
 /*!
  * \brief List recordings that are complete.
@@ -49,9 +49,9 @@ struct ast_get_stored_recordings_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_get_stored_recordings(struct ast_variable *headers, struct ast_get_stored_recordings_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_get_stored_recording() */
-struct ast_get_stored_recording_args {
+void ast_ari_recordings_list_stored(struct ast_variable *headers, struct ast_ari_recordings_list_stored_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_recordings_get_stored() */
+struct ast_ari_recordings_get_stored_args {
 	/*! \brief The name of the recording */
 	const char *recording_name;
 };
@@ -62,9 +62,9 @@ struct ast_get_stored_recording_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_get_stored_recording(struct ast_variable *headers, struct ast_get_stored_recording_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_delete_stored_recording() */
-struct ast_delete_stored_recording_args {
+void ast_ari_recordings_get_stored(struct ast_variable *headers, struct ast_ari_recordings_get_stored_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_recordings_delete_stored() */
+struct ast_ari_recordings_delete_stored_args {
 	/*! \brief The name of the recording */
 	const char *recording_name;
 };
@@ -75,9 +75,9 @@ struct ast_delete_stored_recording_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_delete_stored_recording(struct ast_variable *headers, struct ast_delete_stored_recording_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_get_live_recording() */
-struct ast_get_live_recording_args {
+void ast_ari_recordings_delete_stored(struct ast_variable *headers, struct ast_ari_recordings_delete_stored_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_recordings_get_live() */
+struct ast_ari_recordings_get_live_args {
 	/*! \brief The name of the recording */
 	const char *recording_name;
 };
@@ -88,9 +88,9 @@ struct ast_get_live_recording_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_get_live_recording(struct ast_variable *headers, struct ast_get_live_recording_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_cancel_recording() */
-struct ast_cancel_recording_args {
+void ast_ari_recordings_get_live(struct ast_variable *headers, struct ast_ari_recordings_get_live_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_recordings_cancel() */
+struct ast_ari_recordings_cancel_args {
 	/*! \brief The name of the recording */
 	const char *recording_name;
 };
@@ -101,9 +101,9 @@ struct ast_cancel_recording_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_cancel_recording(struct ast_variable *headers, struct ast_cancel_recording_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_stop_recording() */
-struct ast_stop_recording_args {
+void ast_ari_recordings_cancel(struct ast_variable *headers, struct ast_ari_recordings_cancel_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_recordings_stop() */
+struct ast_ari_recordings_stop_args {
 	/*! \brief The name of the recording */
 	const char *recording_name;
 };
@@ -114,9 +114,9 @@ struct ast_stop_recording_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_stop_recording(struct ast_variable *headers, struct ast_stop_recording_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_pause_recording() */
-struct ast_pause_recording_args {
+void ast_ari_recordings_stop(struct ast_variable *headers, struct ast_ari_recordings_stop_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_recordings_pause() */
+struct ast_ari_recordings_pause_args {
 	/*! \brief The name of the recording */
 	const char *recording_name;
 };
@@ -129,9 +129,9 @@ struct ast_pause_recording_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_pause_recording(struct ast_variable *headers, struct ast_pause_recording_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_unpause_recording() */
-struct ast_unpause_recording_args {
+void ast_ari_recordings_pause(struct ast_variable *headers, struct ast_ari_recordings_pause_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_recordings_unpause() */
+struct ast_ari_recordings_unpause_args {
 	/*! \brief The name of the recording */
 	const char *recording_name;
 };
@@ -142,9 +142,9 @@ struct ast_unpause_recording_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_unpause_recording(struct ast_variable *headers, struct ast_unpause_recording_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_mute_recording() */
-struct ast_mute_recording_args {
+void ast_ari_recordings_unpause(struct ast_variable *headers, struct ast_ari_recordings_unpause_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_recordings_mute() */
+struct ast_ari_recordings_mute_args {
 	/*! \brief The name of the recording */
 	const char *recording_name;
 };
@@ -157,9 +157,9 @@ struct ast_mute_recording_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_mute_recording(struct ast_variable *headers, struct ast_mute_recording_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_unmute_recording() */
-struct ast_unmute_recording_args {
+void ast_ari_recordings_mute(struct ast_variable *headers, struct ast_ari_recordings_mute_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_recordings_unmute() */
+struct ast_ari_recordings_unmute_args {
 	/*! \brief The name of the recording */
 	const char *recording_name;
 };
@@ -170,6 +170,6 @@ struct ast_unmute_recording_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_unmute_recording(struct ast_variable *headers, struct ast_unmute_recording_args *args, struct ast_ari_response *response);
+void ast_ari_recordings_unmute(struct ast_variable *headers, struct ast_ari_recordings_unmute_args *args, struct ast_ari_response *response);
 
 #endif /* _ASTERISK_RESOURCE_RECORDINGS_H */
diff --git a/res/ari/resource_sounds.c b/res/ari/resource_sounds.c
index f77c8a227..5be4bf9a8 100644
--- a/res/ari/resource_sounds.c
+++ b/res/ari/resource_sounds.c
@@ -95,7 +95,8 @@ static int filter_langs_cb(void *obj, void *arg, int flags)
 }
 
 /*! \brief Generate a Sound structure as documented in sounds.json for the specified filename */
-static struct ast_json *create_sound_blob(const char *filename, struct ast_get_sounds_args *args)
+static struct ast_json *create_sound_blob(const char *filename,
+	struct ast_ari_sounds_list_args *args)
 {
 	RAII_VAR(struct ast_json *, sound, NULL, ast_json_unref);
 	RAII_VAR(struct ao2_container *, languages, NULL, ao2_cleanup);
@@ -163,7 +164,7 @@ static int append_sound_cb(void *obj, void *arg, void *data, int flags)
 {
 	struct ast_json *sounds_array = arg;
 	char *filename = obj;
-	struct ast_get_sounds_args *args = data;
+	struct ast_ari_sounds_list_args *args = data;
 	struct ast_json *sound_blob = create_sound_blob(filename, args);
 	if (!sound_blob) {
 		return 0;
@@ -173,7 +174,9 @@ static int append_sound_cb(void *obj, void *arg, void *data, int flags)
 	return 0;
 }
 
-void ast_ari_get_sounds(struct ast_variable *headers, struct ast_get_sounds_args *args, struct ast_ari_response *response)
+void ast_ari_sounds_list(struct ast_variable *headers,
+	struct ast_ari_sounds_list_args *args,
+	struct ast_ari_response *response)
 {
 	RAII_VAR(struct ao2_container *, sound_files, NULL, ao2_cleanup);
 	struct ast_json *sounds_blob;
@@ -206,7 +209,9 @@ void ast_ari_get_sounds(struct ast_variable *headers, struct ast_get_sounds_args
 	ast_ari_response_ok(response, sounds_blob);
 }
 
-void ast_ari_get_stored_sound(struct ast_variable *headers, struct ast_get_stored_sound_args *args, struct ast_ari_response *response)
+void ast_ari_sounds_get(struct ast_variable *headers,
+	struct ast_ari_sounds_get_args *args,
+	struct ast_ari_response *response)
 {
 	struct ast_json *sound_blob;
 
diff --git a/res/ari/resource_sounds.h b/res/ari/resource_sounds.h
index fa7cda23c..5e8ddd43d 100644
--- a/res/ari/resource_sounds.h
+++ b/res/ari/resource_sounds.h
@@ -39,8 +39,8 @@
 
 #include "asterisk/ari.h"
 
-/*! \brief Argument struct for ast_ari_get_sounds() */
-struct ast_get_sounds_args {
+/*! \brief Argument struct for ast_ari_sounds_list() */
+struct ast_ari_sounds_list_args {
 	/*! \brief Lookup sound for a specific language. */
 	const char *lang;
 	/*! \brief Lookup sound in a specific format. */
@@ -53,9 +53,9 @@ struct ast_get_sounds_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_get_sounds(struct ast_variable *headers, struct ast_get_sounds_args *args, struct ast_ari_response *response);
-/*! \brief Argument struct for ast_ari_get_stored_sound() */
-struct ast_get_stored_sound_args {
+void ast_ari_sounds_list(struct ast_variable *headers, struct ast_ari_sounds_list_args *args, struct ast_ari_response *response);
+/*! \brief Argument struct for ast_ari_sounds_get() */
+struct ast_ari_sounds_get_args {
 	/*! \brief Sound's id */
 	const char *sound_id;
 };
@@ -66,6 +66,6 @@ struct ast_get_stored_sound_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_get_stored_sound(struct ast_variable *headers, struct ast_get_stored_sound_args *args, struct ast_ari_response *response);
+void ast_ari_sounds_get(struct ast_variable *headers, struct ast_ari_sounds_get_args *args, struct ast_ari_response *response);
 
 #endif /* _ASTERISK_RESOURCE_SOUNDS_H */
diff --git a/res/res_ari_applications.c b/res/res_ari_applications.c
index 8077f309f..565e3a7ab 100644
--- a/res/res_ari_applications.c
+++ b/res/res_ari_applications.c
@@ -58,17 +58,17 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_get_applications_cb(
+static void ast_ari_applications_list_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_get_applications_args args = {};
+	struct ast_ari_applications_list_args args = {};
 #if defined(AST_DEVMODE)
 	int is_valid;
 	int code;
 #endif /* AST_DEVMODE */
 
-	ast_ari_get_applications(headers, &args, response);
+	ast_ari_applications_list(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -107,11 +107,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_get_application_cb(
+static void ast_ari_applications_get_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_get_application_args args = {};
+	struct ast_ari_applications_get_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -124,7 +124,7 @@ static void ast_ari_get_application_cb(
 		} else
 		{}
 	}
-	ast_ari_get_application(headers, &args, response);
+	ast_ari_applications_get(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -164,11 +164,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_application_subscribe_cb(
+static void ast_ari_applications_subscribe_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_application_subscribe_args args = {};
+	struct ast_ari_applications_subscribe_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -227,7 +227,7 @@ static void ast_ari_application_subscribe_cb(
 		} else
 		{}
 	}
-	ast_ari_application_subscribe(headers, &args, response);
+	ast_ari_applications_subscribe(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -271,11 +271,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_application_unsubscribe_cb(
+static void ast_ari_applications_unsubscribe_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_application_unsubscribe_args args = {};
+	struct ast_ari_applications_unsubscribe_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -334,7 +334,7 @@ static void ast_ari_application_unsubscribe_cb(
 		} else
 		{}
 	}
-	ast_ari_application_unsubscribe(headers, &args, response);
+	ast_ari_applications_unsubscribe(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -377,8 +377,8 @@ fin: __attribute__((unused))
 static struct stasis_rest_handlers applications_applicationName_subscription = {
 	.path_segment = "subscription",
 	.callbacks = {
-		[AST_HTTP_POST] = ast_ari_application_subscribe_cb,
-		[AST_HTTP_DELETE] = ast_ari_application_unsubscribe_cb,
+		[AST_HTTP_POST] = ast_ari_applications_subscribe_cb,
+		[AST_HTTP_DELETE] = ast_ari_applications_unsubscribe_cb,
 	},
 	.num_children = 0,
 	.children = {  }
@@ -388,7 +388,7 @@ static struct stasis_rest_handlers applications_applicationName = {
 	.path_segment = "applicationName",
 	.is_wildcard = 1,
 	.callbacks = {
-		[AST_HTTP_GET] = ast_ari_get_application_cb,
+		[AST_HTTP_GET] = ast_ari_applications_get_cb,
 	},
 	.num_children = 1,
 	.children = { &applications_applicationName_subscription, }
@@ -397,7 +397,7 @@ static struct stasis_rest_handlers applications_applicationName = {
 static struct stasis_rest_handlers applications = {
 	.path_segment = "applications",
 	.callbacks = {
-		[AST_HTTP_GET] = ast_ari_get_applications_cb,
+		[AST_HTTP_GET] = ast_ari_applications_list_cb,
 	},
 	.num_children = 1,
 	.children = { &applications_applicationName, }
diff --git a/res/res_ari_asterisk.c b/res/res_ari_asterisk.c
index 3f0c285ad..c83c2f6a3 100644
--- a/res/res_ari_asterisk.c
+++ b/res/res_ari_asterisk.c
@@ -58,11 +58,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_get_asterisk_info_cb(
+static void ast_ari_asterisk_get_info_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_get_asterisk_info_args args = {};
+	struct ast_ari_asterisk_get_info_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -115,7 +115,7 @@ static void ast_ari_get_asterisk_info_cb(
 		} else
 		{}
 	}
-	ast_ari_get_asterisk_info(headers, &args, response);
+	ast_ari_asterisk_get_info(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -156,11 +156,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_get_global_var_cb(
+static void ast_ari_asterisk_get_global_var_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_get_global_var_args args = {};
+	struct ast_ari_asterisk_get_global_var_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -173,7 +173,7 @@ static void ast_ari_get_global_var_cb(
 		} else
 		{}
 	}
-	ast_ari_get_global_var(headers, &args, response);
+	ast_ari_asterisk_get_global_var(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -213,11 +213,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_set_global_var_cb(
+static void ast_ari_asterisk_set_global_var_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_set_global_var_args args = {};
+	struct ast_ari_asterisk_set_global_var_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -233,7 +233,7 @@ static void ast_ari_set_global_var_cb(
 		} else
 		{}
 	}
-	ast_ari_set_global_var(headers, &args, response);
+	ast_ari_asterisk_set_global_var(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -271,7 +271,7 @@ fin: __attribute__((unused))
 static struct stasis_rest_handlers asterisk_info = {
 	.path_segment = "info",
 	.callbacks = {
-		[AST_HTTP_GET] = ast_ari_get_asterisk_info_cb,
+		[AST_HTTP_GET] = ast_ari_asterisk_get_info_cb,
 	},
 	.num_children = 0,
 	.children = {  }
@@ -280,8 +280,8 @@ static struct stasis_rest_handlers asterisk_info = {
 static struct stasis_rest_handlers asterisk_variable = {
 	.path_segment = "variable",
 	.callbacks = {
-		[AST_HTTP_GET] = ast_ari_get_global_var_cb,
-		[AST_HTTP_POST] = ast_ari_set_global_var_cb,
+		[AST_HTTP_GET] = ast_ari_asterisk_get_global_var_cb,
+		[AST_HTTP_POST] = ast_ari_asterisk_set_global_var_cb,
 	},
 	.num_children = 0,
 	.children = {  }
diff --git a/res/res_ari_bridges.c b/res/res_ari_bridges.c
index d34505e2b..3020c4a62 100644
--- a/res/res_ari_bridges.c
+++ b/res/res_ari_bridges.c
@@ -58,17 +58,17 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_get_bridges_cb(
+static void ast_ari_bridges_list_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_get_bridges_args args = {};
+	struct ast_ari_bridges_list_args args = {};
 #if defined(AST_DEVMODE)
 	int is_valid;
 	int code;
 #endif /* AST_DEVMODE */
 
-	ast_ari_get_bridges(headers, &args, response);
+	ast_ari_bridges_list(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -107,11 +107,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_new_bridge_cb(
+static void ast_ari_bridges_create_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_new_bridge_args args = {};
+	struct ast_ari_bridges_create_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -124,7 +124,7 @@ static void ast_ari_new_bridge_cb(
 		} else
 		{}
 	}
-	ast_ari_new_bridge(headers, &args, response);
+	ast_ari_bridges_create(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -163,11 +163,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_get_bridge_cb(
+static void ast_ari_bridges_get_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_get_bridge_args args = {};
+	struct ast_ari_bridges_get_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -180,7 +180,7 @@ static void ast_ari_get_bridge_cb(
 		} else
 		{}
 	}
-	ast_ari_get_bridge(headers, &args, response);
+	ast_ari_bridges_get(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -220,11 +220,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_delete_bridge_cb(
+static void ast_ari_bridges_destroy_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_delete_bridge_args args = {};
+	struct ast_ari_bridges_destroy_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -237,7 +237,7 @@ static void ast_ari_delete_bridge_cb(
 		} else
 		{}
 	}
-	ast_ari_delete_bridge(headers, &args, response);
+	ast_ari_bridges_destroy(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -277,11 +277,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_add_channel_to_bridge_cb(
+static void ast_ari_bridges_add_channel_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_add_channel_to_bridge_args args = {};
+	struct ast_ari_bridges_add_channel_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -343,7 +343,7 @@ static void ast_ari_add_channel_to_bridge_cb(
 		} else
 		{}
 	}
-	ast_ari_add_channel_to_bridge(headers, &args, response);
+	ast_ari_bridges_add_channel(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -388,11 +388,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_remove_channel_from_bridge_cb(
+static void ast_ari_bridges_remove_channel_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_remove_channel_from_bridge_args args = {};
+	struct ast_ari_bridges_remove_channel_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -451,7 +451,7 @@ static void ast_ari_remove_channel_from_bridge_cb(
 		} else
 		{}
 	}
-	ast_ari_remove_channel_from_bridge(headers, &args, response);
+	ast_ari_bridges_remove_channel(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -496,11 +496,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_moh_start_bridge_cb(
+static void ast_ari_bridges_start_moh_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_moh_start_bridge_args args = {};
+	struct ast_ari_bridges_start_moh_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -519,7 +519,7 @@ static void ast_ari_moh_start_bridge_cb(
 		} else
 		{}
 	}
-	ast_ari_moh_start_bridge(headers, &args, response);
+	ast_ari_bridges_start_moh(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -560,11 +560,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_moh_stop_bridge_cb(
+static void ast_ari_bridges_stop_moh_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_moh_stop_bridge_args args = {};
+	struct ast_ari_bridges_stop_moh_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -577,7 +577,7 @@ static void ast_ari_moh_stop_bridge_cb(
 		} else
 		{}
 	}
-	ast_ari_moh_stop_bridge(headers, &args, response);
+	ast_ari_bridges_stop_moh(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -618,11 +618,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_play_on_bridge_cb(
+static void ast_ari_bridges_play_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_play_on_bridge_args args = {};
+	struct ast_ari_bridges_play_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -650,7 +650,7 @@ static void ast_ari_play_on_bridge_cb(
 		} else
 		{}
 	}
-	ast_ari_play_on_bridge(headers, &args, response);
+	ast_ari_bridges_play(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -691,11 +691,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_record_bridge_cb(
+static void ast_ari_bridges_record_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_record_bridge_args args = {};
+	struct ast_ari_bridges_record_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -732,7 +732,7 @@ static void ast_ari_record_bridge_cb(
 		} else
 		{}
 	}
-	ast_ari_record_bridge(headers, &args, response);
+	ast_ari_bridges_record(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -773,7 +773,7 @@ fin: __attribute__((unused))
 static struct stasis_rest_handlers bridges_bridgeId_addChannel = {
 	.path_segment = "addChannel",
 	.callbacks = {
-		[AST_HTTP_POST] = ast_ari_add_channel_to_bridge_cb,
+		[AST_HTTP_POST] = ast_ari_bridges_add_channel_cb,
 	},
 	.num_children = 0,
 	.children = {  }
@@ -782,7 +782,7 @@ static struct stasis_rest_handlers bridges_bridgeId_addChannel = {
 static struct stasis_rest_handlers bridges_bridgeId_removeChannel = {
 	.path_segment = "removeChannel",
 	.callbacks = {
-		[AST_HTTP_POST] = ast_ari_remove_channel_from_bridge_cb,
+		[AST_HTTP_POST] = ast_ari_bridges_remove_channel_cb,
 	},
 	.num_children = 0,
 	.children = {  }
@@ -791,8 +791,8 @@ static struct stasis_rest_handlers bridges_bridgeId_removeChannel = {
 static struct stasis_rest_handlers bridges_bridgeId_moh = {
 	.path_segment = "moh",
 	.callbacks = {
-		[AST_HTTP_POST] = ast_ari_moh_start_bridge_cb,
-		[AST_HTTP_DELETE] = ast_ari_moh_stop_bridge_cb,
+		[AST_HTTP_POST] = ast_ari_bridges_start_moh_cb,
+		[AST_HTTP_DELETE] = ast_ari_bridges_stop_moh_cb,
 	},
 	.num_children = 0,
 	.children = {  }
@@ -801,7 +801,7 @@ static struct stasis_rest_handlers bridges_bridgeId_moh = {
 static struct stasis_rest_handlers bridges_bridgeId_play = {
 	.path_segment = "play",
 	.callbacks = {
-		[AST_HTTP_POST] = ast_ari_play_on_bridge_cb,
+		[AST_HTTP_POST] = ast_ari_bridges_play_cb,
 	},
 	.num_children = 0,
 	.children = {  }
@@ -810,7 +810,7 @@ static struct stasis_rest_handlers bridges_bridgeId_play = {
 static struct stasis_rest_handlers bridges_bridgeId_record = {
 	.path_segment = "record",
 	.callbacks = {
-		[AST_HTTP_POST] = ast_ari_record_bridge_cb,
+		[AST_HTTP_POST] = ast_ari_bridges_record_cb,
 	},
 	.num_children = 0,
 	.children = {  }
@@ -820,8 +820,8 @@ static struct stasis_rest_handlers bridges_bridgeId = {
 	.path_segment = "bridgeId",
 	.is_wildcard = 1,
 	.callbacks = {
-		[AST_HTTP_GET] = ast_ari_get_bridge_cb,
-		[AST_HTTP_DELETE] = ast_ari_delete_bridge_cb,
+		[AST_HTTP_GET] = ast_ari_bridges_get_cb,
+		[AST_HTTP_DELETE] = ast_ari_bridges_destroy_cb,
 	},
 	.num_children = 5,
 	.children = { &bridges_bridgeId_addChannel,&bridges_bridgeId_removeChannel,&bridges_bridgeId_moh,&bridges_bridgeId_play,&bridges_bridgeId_record, }
@@ -830,8 +830,8 @@ static struct stasis_rest_handlers bridges_bridgeId = {
 static struct stasis_rest_handlers bridges = {
 	.path_segment = "bridges",
 	.callbacks = {
-		[AST_HTTP_GET] = ast_ari_get_bridges_cb,
-		[AST_HTTP_POST] = ast_ari_new_bridge_cb,
+		[AST_HTTP_GET] = ast_ari_bridges_list_cb,
+		[AST_HTTP_POST] = ast_ari_bridges_create_cb,
 	},
 	.num_children = 1,
 	.children = { &bridges_bridgeId, }
diff --git a/res/res_ari_channels.c b/res/res_ari_channels.c
index e8b676977..82cb1740f 100644
--- a/res/res_ari_channels.c
+++ b/res/res_ari_channels.c
@@ -58,17 +58,17 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_get_channels_cb(
+static void ast_ari_channels_list_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_get_channels_args args = {};
+	struct ast_ari_channels_list_args args = {};
 #if defined(AST_DEVMODE)
 	int is_valid;
 	int code;
 #endif /* AST_DEVMODE */
 
-	ast_ari_get_channels(headers, &args, response);
+	ast_ari_channels_list(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -107,11 +107,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_originate_cb(
+static void ast_ari_channels_originate_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_originate_args args = {};
+	struct ast_ari_channels_originate_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -145,7 +145,7 @@ static void ast_ari_originate_cb(
 		} else
 		{}
 	}
-	ast_ari_originate(headers, &args, response);
+	ast_ari_channels_originate(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -185,11 +185,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_get_channel_cb(
+static void ast_ari_channels_get_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_get_channel_args args = {};
+	struct ast_ari_channels_get_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -202,7 +202,7 @@ static void ast_ari_get_channel_cb(
 		} else
 		{}
 	}
-	ast_ari_get_channel(headers, &args, response);
+	ast_ari_channels_get(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -242,11 +242,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_delete_channel_cb(
+static void ast_ari_channels_hangup_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_delete_channel_args args = {};
+	struct ast_ari_channels_hangup_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -265,7 +265,7 @@ static void ast_ari_delete_channel_cb(
 		} else
 		{}
 	}
-	ast_ari_delete_channel(headers, &args, response);
+	ast_ari_channels_hangup(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -306,11 +306,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_continue_in_dialplan_cb(
+static void ast_ari_channels_continue_in_dialplan_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_continue_in_dialplan_args args = {};
+	struct ast_ari_channels_continue_in_dialplan_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -335,7 +335,7 @@ static void ast_ari_continue_in_dialplan_cb(
 		} else
 		{}
 	}
-	ast_ari_continue_in_dialplan(headers, &args, response);
+	ast_ari_channels_continue_in_dialplan(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -376,11 +376,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_answer_channel_cb(
+static void ast_ari_channels_answer_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_answer_channel_args args = {};
+	struct ast_ari_channels_answer_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -393,7 +393,7 @@ static void ast_ari_answer_channel_cb(
 		} else
 		{}
 	}
-	ast_ari_answer_channel(headers, &args, response);
+	ast_ari_channels_answer(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -434,11 +434,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_ring_channel_cb(
+static void ast_ari_channels_ring_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_ring_channel_args args = {};
+	struct ast_ari_channels_ring_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -451,7 +451,7 @@ static void ast_ari_ring_channel_cb(
 		} else
 		{}
 	}
-	ast_ari_ring_channel(headers, &args, response);
+	ast_ari_channels_ring(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -492,11 +492,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_send_dtmfchannel_cb(
+static void ast_ari_channels_send_dtmf_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_send_dtmfchannel_args args = {};
+	struct ast_ari_channels_send_dtmf_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -527,7 +527,7 @@ static void ast_ari_send_dtmfchannel_cb(
 		} else
 		{}
 	}
-	ast_ari_send_dtmfchannel(headers, &args, response);
+	ast_ari_channels_send_dtmf(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -569,11 +569,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_mute_channel_cb(
+static void ast_ari_channels_mute_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_mute_channel_args args = {};
+	struct ast_ari_channels_mute_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -592,7 +592,7 @@ static void ast_ari_mute_channel_cb(
 		} else
 		{}
 	}
-	ast_ari_mute_channel(headers, &args, response);
+	ast_ari_channels_mute(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -627,17 +627,17 @@ fin: __attribute__((unused))
 	return;
 }
 /*!
- * \brief Parameter parsing callback for /channels/{channelId}/unmute.
+ * \brief Parameter parsing callback for /channels/{channelId}/mute.
  * \param get_params GET parameters in the HTTP request.
  * \param path_vars Path variables extracted from the request.
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_unmute_channel_cb(
+static void ast_ari_channels_unmute_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_unmute_channel_args args = {};
+	struct ast_ari_channels_unmute_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -656,7 +656,7 @@ static void ast_ari_unmute_channel_cb(
 		} else
 		{}
 	}
-	ast_ari_unmute_channel(headers, &args, response);
+	ast_ari_channels_unmute(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -675,13 +675,13 @@ static void ast_ari_unmute_channel_cb(
 			is_valid = ast_ari_validate_void(
 				response->message);
 		} else {
-			ast_log(LOG_ERROR, "Invalid error response %d for /channels/{channelId}/unmute\n", code);
+			ast_log(LOG_ERROR, "Invalid error response %d for /channels/{channelId}/mute\n", code);
 			is_valid = 0;
 		}
 	}
 
 	if (!is_valid) {
-		ast_log(LOG_ERROR, "Response validation failed for /channels/{channelId}/unmute\n");
+		ast_log(LOG_ERROR, "Response validation failed for /channels/{channelId}/mute\n");
 		ast_ari_response_error(response, 500,
 			"Internal Server Error", "Response validation failed");
 	}
@@ -697,11 +697,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_hold_channel_cb(
+static void ast_ari_channels_hold_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_hold_channel_args args = {};
+	struct ast_ari_channels_hold_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -714,7 +714,7 @@ static void ast_ari_hold_channel_cb(
 		} else
 		{}
 	}
-	ast_ari_hold_channel(headers, &args, response);
+	ast_ari_channels_hold(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -755,11 +755,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_unhold_channel_cb(
+static void ast_ari_channels_unhold_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_unhold_channel_args args = {};
+	struct ast_ari_channels_unhold_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -772,7 +772,7 @@ static void ast_ari_unhold_channel_cb(
 		} else
 		{}
 	}
-	ast_ari_unhold_channel(headers, &args, response);
+	ast_ari_channels_unhold(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -813,11 +813,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_moh_start_channel_cb(
+static void ast_ari_channels_start_moh_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_moh_start_channel_args args = {};
+	struct ast_ari_channels_start_moh_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -836,7 +836,7 @@ static void ast_ari_moh_start_channel_cb(
 		} else
 		{}
 	}
-	ast_ari_moh_start_channel(headers, &args, response);
+	ast_ari_channels_start_moh(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -877,11 +877,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_moh_stop_channel_cb(
+static void ast_ari_channels_stop_moh_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_moh_stop_channel_args args = {};
+	struct ast_ari_channels_stop_moh_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -894,7 +894,7 @@ static void ast_ari_moh_stop_channel_cb(
 		} else
 		{}
 	}
-	ast_ari_moh_stop_channel(headers, &args, response);
+	ast_ari_channels_stop_moh(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -935,11 +935,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_play_on_channel_cb(
+static void ast_ari_channels_play_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_play_on_channel_args args = {};
+	struct ast_ari_channels_play_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -967,7 +967,7 @@ static void ast_ari_play_on_channel_cb(
 		} else
 		{}
 	}
-	ast_ari_play_on_channel(headers, &args, response);
+	ast_ari_channels_play(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -1008,11 +1008,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_record_channel_cb(
+static void ast_ari_channels_record_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_record_channel_args args = {};
+	struct ast_ari_channels_record_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -1049,7 +1049,7 @@ static void ast_ari_record_channel_cb(
 		} else
 		{}
 	}
-	ast_ari_record_channel(headers, &args, response);
+	ast_ari_channels_record(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -1092,11 +1092,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_get_channel_var_cb(
+static void ast_ari_channels_get_channel_var_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_get_channel_var_args args = {};
+	struct ast_ari_channels_get_channel_var_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -1115,7 +1115,7 @@ static void ast_ari_get_channel_var_cb(
 		} else
 		{}
 	}
-	ast_ari_get_channel_var(headers, &args, response);
+	ast_ari_channels_get_channel_var(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -1157,11 +1157,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_set_channel_var_cb(
+static void ast_ari_channels_set_channel_var_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_set_channel_var_args args = {};
+	struct ast_ari_channels_set_channel_var_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -1183,7 +1183,7 @@ static void ast_ari_set_channel_var_cb(
 		} else
 		{}
 	}
-	ast_ari_set_channel_var(headers, &args, response);
+	ast_ari_channels_set_channel_var(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -1223,7 +1223,7 @@ fin: __attribute__((unused))
 static struct stasis_rest_handlers channels_channelId_continue = {
 	.path_segment = "continue",
 	.callbacks = {
-		[AST_HTTP_POST] = ast_ari_continue_in_dialplan_cb,
+		[AST_HTTP_POST] = ast_ari_channels_continue_in_dialplan_cb,
 	},
 	.num_children = 0,
 	.children = {  }
@@ -1232,7 +1232,7 @@ static struct stasis_rest_handlers channels_channelId_continue = {
 static struct stasis_rest_handlers channels_channelId_answer = {
 	.path_segment = "answer",
 	.callbacks = {
-		[AST_HTTP_POST] = ast_ari_answer_channel_cb,
+		[AST_HTTP_POST] = ast_ari_channels_answer_cb,
 	},
 	.num_children = 0,
 	.children = {  }
@@ -1241,7 +1241,7 @@ static struct stasis_rest_handlers channels_channelId_answer = {
 static struct stasis_rest_handlers channels_channelId_ring = {
 	.path_segment = "ring",
 	.callbacks = {
-		[AST_HTTP_POST] = ast_ari_ring_channel_cb,
+		[AST_HTTP_POST] = ast_ari_channels_ring_cb,
 	},
 	.num_children = 0,
 	.children = {  }
@@ -1250,7 +1250,7 @@ static struct stasis_rest_handlers channels_channelId_ring = {
 static struct stasis_rest_handlers channels_channelId_dtmf = {
 	.path_segment = "dtmf",
 	.callbacks = {
-		[AST_HTTP_POST] = ast_ari_send_dtmfchannel_cb,
+		[AST_HTTP_POST] = ast_ari_channels_send_dtmf_cb,
 	},
 	.num_children = 0,
 	.children = {  }
@@ -1259,16 +1259,8 @@ static struct stasis_rest_handlers channels_channelId_dtmf = {
 static struct stasis_rest_handlers channels_channelId_mute = {
 	.path_segment = "mute",
 	.callbacks = {
-		[AST_HTTP_POST] = ast_ari_mute_channel_cb,
-	},
-	.num_children = 0,
-	.children = {  }
-};
-/*! \brief REST handler for /api-docs/channels.{format} */
-static struct stasis_rest_handlers channels_channelId_unmute = {
-	.path_segment = "unmute",
-	.callbacks = {
-		[AST_HTTP_POST] = ast_ari_unmute_channel_cb,
+		[AST_HTTP_POST] = ast_ari_channels_mute_cb,
+		[AST_HTTP_DELETE] = ast_ari_channels_unmute_cb,
 	},
 	.num_children = 0,
 	.children = {  }
@@ -1277,8 +1269,8 @@ static struct stasis_rest_handlers channels_channelId_unmute = {
 static struct stasis_rest_handlers channels_channelId_hold = {
 	.path_segment = "hold",
 	.callbacks = {
-		[AST_HTTP_POST] = ast_ari_hold_channel_cb,
-		[AST_HTTP_DELETE] = ast_ari_unhold_channel_cb,
+		[AST_HTTP_POST] = ast_ari_channels_hold_cb,
+		[AST_HTTP_DELETE] = ast_ari_channels_unhold_cb,
 	},
 	.num_children = 0,
 	.children = {  }
@@ -1287,8 +1279,8 @@ static struct stasis_rest_handlers channels_channelId_hold = {
 static struct stasis_rest_handlers channels_channelId_moh = {
 	.path_segment = "moh",
 	.callbacks = {
-		[AST_HTTP_POST] = ast_ari_moh_start_channel_cb,
-		[AST_HTTP_DELETE] = ast_ari_moh_stop_channel_cb,
+		[AST_HTTP_POST] = ast_ari_channels_start_moh_cb,
+		[AST_HTTP_DELETE] = ast_ari_channels_stop_moh_cb,
 	},
 	.num_children = 0,
 	.children = {  }
@@ -1297,7 +1289,7 @@ static struct stasis_rest_handlers channels_channelId_moh = {
 static struct stasis_rest_handlers channels_channelId_play = {
 	.path_segment = "play",
 	.callbacks = {
-		[AST_HTTP_POST] = ast_ari_play_on_channel_cb,
+		[AST_HTTP_POST] = ast_ari_channels_play_cb,
 	},
 	.num_children = 0,
 	.children = {  }
@@ -1306,7 +1298,7 @@ static struct stasis_rest_handlers channels_channelId_play = {
 static struct stasis_rest_handlers channels_channelId_record = {
 	.path_segment = "record",
 	.callbacks = {
-		[AST_HTTP_POST] = ast_ari_record_channel_cb,
+		[AST_HTTP_POST] = ast_ari_channels_record_cb,
 	},
 	.num_children = 0,
 	.children = {  }
@@ -1315,8 +1307,8 @@ static struct stasis_rest_handlers channels_channelId_record = {
 static struct stasis_rest_handlers channels_channelId_variable = {
 	.path_segment = "variable",
 	.callbacks = {
-		[AST_HTTP_GET] = ast_ari_get_channel_var_cb,
-		[AST_HTTP_POST] = ast_ari_set_channel_var_cb,
+		[AST_HTTP_GET] = ast_ari_channels_get_channel_var_cb,
+		[AST_HTTP_POST] = ast_ari_channels_set_channel_var_cb,
 	},
 	.num_children = 0,
 	.children = {  }
@@ -1326,18 +1318,18 @@ static struct stasis_rest_handlers channels_channelId = {
 	.path_segment = "channelId",
 	.is_wildcard = 1,
 	.callbacks = {
-		[AST_HTTP_GET] = ast_ari_get_channel_cb,
-		[AST_HTTP_DELETE] = ast_ari_delete_channel_cb,
+		[AST_HTTP_GET] = ast_ari_channels_get_cb,
+		[AST_HTTP_DELETE] = ast_ari_channels_hangup_cb,
 	},
-	.num_children = 11,
-	.children = { &channels_channelId_continue,&channels_channelId_answer,&channels_channelId_ring,&channels_channelId_dtmf,&channels_channelId_mute,&channels_channelId_unmute,&channels_channelId_hold,&channels_channelId_moh,&channels_channelId_play,&channels_channelId_record,&channels_channelId_variable, }
+	.num_children = 10,
+	.children = { &channels_channelId_continue,&channels_channelId_answer,&channels_channelId_ring,&channels_channelId_dtmf,&channels_channelId_mute,&channels_channelId_hold,&channels_channelId_moh,&channels_channelId_play,&channels_channelId_record,&channels_channelId_variable, }
 };
 /*! \brief REST handler for /api-docs/channels.{format} */
 static struct stasis_rest_handlers channels = {
 	.path_segment = "channels",
 	.callbacks = {
-		[AST_HTTP_GET] = ast_ari_get_channels_cb,
-		[AST_HTTP_POST] = ast_ari_originate_cb,
+		[AST_HTTP_GET] = ast_ari_channels_list_cb,
+		[AST_HTTP_POST] = ast_ari_channels_originate_cb,
 	},
 	.num_children = 1,
 	.children = { &channels_channelId, }
diff --git a/res/res_ari_endpoints.c b/res/res_ari_endpoints.c
index a1dd759eb..082272518 100644
--- a/res/res_ari_endpoints.c
+++ b/res/res_ari_endpoints.c
@@ -58,17 +58,17 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_get_endpoints_cb(
+static void ast_ari_endpoints_list_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_get_endpoints_args args = {};
+	struct ast_ari_endpoints_list_args args = {};
 #if defined(AST_DEVMODE)
 	int is_valid;
 	int code;
 #endif /* AST_DEVMODE */
 
-	ast_ari_get_endpoints(headers, &args, response);
+	ast_ari_endpoints_list(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -107,11 +107,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_get_endpoints_by_tech_cb(
+static void ast_ari_endpoints_list_by_tech_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_get_endpoints_by_tech_args args = {};
+	struct ast_ari_endpoints_list_by_tech_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -124,7 +124,7 @@ static void ast_ari_get_endpoints_by_tech_cb(
 		} else
 		{}
 	}
-	ast_ari_get_endpoints_by_tech(headers, &args, response);
+	ast_ari_endpoints_list_by_tech(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -163,11 +163,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_get_endpoint_cb(
+static void ast_ari_endpoints_get_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_get_endpoint_args args = {};
+	struct ast_ari_endpoints_get_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -183,7 +183,7 @@ static void ast_ari_get_endpoint_cb(
 		} else
 		{}
 	}
-	ast_ari_get_endpoint(headers, &args, response);
+	ast_ari_endpoints_get(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -221,7 +221,7 @@ static struct stasis_rest_handlers endpoints_tech_resource = {
 	.path_segment = "resource",
 	.is_wildcard = 1,
 	.callbacks = {
-		[AST_HTTP_GET] = ast_ari_get_endpoint_cb,
+		[AST_HTTP_GET] = ast_ari_endpoints_get_cb,
 	},
 	.num_children = 0,
 	.children = {  }
@@ -231,7 +231,7 @@ static struct stasis_rest_handlers endpoints_tech = {
 	.path_segment = "tech",
 	.is_wildcard = 1,
 	.callbacks = {
-		[AST_HTTP_GET] = ast_ari_get_endpoints_by_tech_cb,
+		[AST_HTTP_GET] = ast_ari_endpoints_list_by_tech_cb,
 	},
 	.num_children = 1,
 	.children = { &endpoints_tech_resource, }
@@ -240,7 +240,7 @@ static struct stasis_rest_handlers endpoints_tech = {
 static struct stasis_rest_handlers endpoints = {
 	.path_segment = "endpoints",
 	.callbacks = {
-		[AST_HTTP_GET] = ast_ari_get_endpoints_cb,
+		[AST_HTTP_GET] = ast_ari_endpoints_list_cb,
 	},
 	.num_children = 1,
 	.children = { &endpoints_tech, }
diff --git a/res/res_ari_events.c b/res/res_ari_events.c
index 17337bbc8..f5a3facd6 100644
--- a/res/res_ari_events.c
+++ b/res/res_ari_events.c
@@ -52,10 +52,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #define MAX_VALS 128
 
-static void ast_ari_event_websocket_ws_cb(struct ast_websocket *ws_session,
+static void ast_ari_events_event_websocket_ws_cb(struct ast_websocket *ws_session,
 	struct ast_variable *get_params, struct ast_variable *headers)
 {
-	struct ast_event_websocket_args args = {};
+	struct ast_ari_events_event_websocket_args args = {};
 	RAII_VAR(struct ast_ari_response *, response, NULL, ast_free);
 	struct ast_variable *i;
 	RAII_VAR(struct ast_websocket *, s, ws_session, ast_websocket_unref);
@@ -125,7 +125,7 @@ static void ast_ari_event_websocket_ws_cb(struct ast_websocket *ws_session,
 		{}
 	}
 
-	ast_ari_websocket_event_websocket(session, headers, &args);
+	ast_ari_websocket_events_event_websocket(session, headers, &args);
 
 fin: __attribute__((unused))
 	if (response && response->response_code != 0) {
@@ -167,7 +167,7 @@ static int load_module(void)
 		return AST_MODULE_LOAD_FAILURE;
 	}
 	res |= ast_websocket_server_add_protocol(events.ws_server,
-		"ari", ast_ari_event_websocket_ws_cb);
+		"ari", ast_ari_events_event_websocket_ws_cb);
 	stasis_app_ref();
 	res |= ast_ari_add_handler(&events);
 	return res;
diff --git a/res/res_ari_playback.c b/res/res_ari_playback.c
index 06538f5a8..1be3f078b 100644
--- a/res/res_ari_playback.c
+++ b/res/res_ari_playback.c
@@ -58,11 +58,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_get_playback_cb(
+static void ast_ari_playback_get_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_get_playback_args args = {};
+	struct ast_ari_playback_get_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -75,7 +75,7 @@ static void ast_ari_get_playback_cb(
 		} else
 		{}
 	}
-	ast_ari_get_playback(headers, &args, response);
+	ast_ari_playback_get(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -115,11 +115,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_stop_playback_cb(
+static void ast_ari_playback_stop_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_stop_playback_args args = {};
+	struct ast_ari_playback_stop_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -132,7 +132,7 @@ static void ast_ari_stop_playback_cb(
 		} else
 		{}
 	}
-	ast_ari_stop_playback(headers, &args, response);
+	ast_ari_playback_stop(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -172,11 +172,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_control_playback_cb(
+static void ast_ari_playback_control_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_control_playback_args args = {};
+	struct ast_ari_playback_control_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -195,7 +195,7 @@ static void ast_ari_control_playback_cb(
 		} else
 		{}
 	}
-	ast_ari_control_playback(headers, &args, response);
+	ast_ari_playback_control(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -235,7 +235,7 @@ fin: __attribute__((unused))
 static struct stasis_rest_handlers playback_playbackId_control = {
 	.path_segment = "control",
 	.callbacks = {
-		[AST_HTTP_POST] = ast_ari_control_playback_cb,
+		[AST_HTTP_POST] = ast_ari_playback_control_cb,
 	},
 	.num_children = 0,
 	.children = {  }
@@ -245,8 +245,8 @@ static struct stasis_rest_handlers playback_playbackId = {
 	.path_segment = "playbackId",
 	.is_wildcard = 1,
 	.callbacks = {
-		[AST_HTTP_GET] = ast_ari_get_playback_cb,
-		[AST_HTTP_DELETE] = ast_ari_stop_playback_cb,
+		[AST_HTTP_GET] = ast_ari_playback_get_cb,
+		[AST_HTTP_DELETE] = ast_ari_playback_stop_cb,
 	},
 	.num_children = 1,
 	.children = { &playback_playbackId_control, }
diff --git a/res/res_ari_recordings.c b/res/res_ari_recordings.c
index 3f7458324..3a4afdc71 100644
--- a/res/res_ari_recordings.c
+++ b/res/res_ari_recordings.c
@@ -58,17 +58,17 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_get_stored_recordings_cb(
+static void ast_ari_recordings_list_stored_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_get_stored_recordings_args args = {};
+	struct ast_ari_recordings_list_stored_args args = {};
 #if defined(AST_DEVMODE)
 	int is_valid;
 	int code;
 #endif /* AST_DEVMODE */
 
-	ast_ari_get_stored_recordings(headers, &args, response);
+	ast_ari_recordings_list_stored(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -107,11 +107,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_get_stored_recording_cb(
+static void ast_ari_recordings_get_stored_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_get_stored_recording_args args = {};
+	struct ast_ari_recordings_get_stored_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -124,7 +124,7 @@ static void ast_ari_get_stored_recording_cb(
 		} else
 		{}
 	}
-	ast_ari_get_stored_recording(headers, &args, response);
+	ast_ari_recordings_get_stored(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -164,11 +164,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_delete_stored_recording_cb(
+static void ast_ari_recordings_delete_stored_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_delete_stored_recording_args args = {};
+	struct ast_ari_recordings_delete_stored_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -181,7 +181,7 @@ static void ast_ari_delete_stored_recording_cb(
 		} else
 		{}
 	}
-	ast_ari_delete_stored_recording(headers, &args, response);
+	ast_ari_recordings_delete_stored(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -221,11 +221,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_get_live_recording_cb(
+static void ast_ari_recordings_get_live_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_get_live_recording_args args = {};
+	struct ast_ari_recordings_get_live_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -238,7 +238,7 @@ static void ast_ari_get_live_recording_cb(
 		} else
 		{}
 	}
-	ast_ari_get_live_recording(headers, &args, response);
+	ast_ari_recordings_get_live(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -278,11 +278,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_cancel_recording_cb(
+static void ast_ari_recordings_cancel_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_cancel_recording_args args = {};
+	struct ast_ari_recordings_cancel_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -295,7 +295,7 @@ static void ast_ari_cancel_recording_cb(
 		} else
 		{}
 	}
-	ast_ari_cancel_recording(headers, &args, response);
+	ast_ari_recordings_cancel(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -335,11 +335,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_stop_recording_cb(
+static void ast_ari_recordings_stop_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_stop_recording_args args = {};
+	struct ast_ari_recordings_stop_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -352,7 +352,7 @@ static void ast_ari_stop_recording_cb(
 		} else
 		{}
 	}
-	ast_ari_stop_recording(headers, &args, response);
+	ast_ari_recordings_stop(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -392,11 +392,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_pause_recording_cb(
+static void ast_ari_recordings_pause_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_pause_recording_args args = {};
+	struct ast_ari_recordings_pause_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -409,7 +409,7 @@ static void ast_ari_pause_recording_cb(
 		} else
 		{}
 	}
-	ast_ari_pause_recording(headers, &args, response);
+	ast_ari_recordings_pause(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -444,17 +444,17 @@ fin: __attribute__((unused))
 	return;
 }
 /*!
- * \brief Parameter parsing callback for /recordings/live/{recordingName}/unpause.
+ * \brief Parameter parsing callback for /recordings/live/{recordingName}/pause.
  * \param get_params GET parameters in the HTTP request.
  * \param path_vars Path variables extracted from the request.
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_unpause_recording_cb(
+static void ast_ari_recordings_unpause_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_unpause_recording_args args = {};
+	struct ast_ari_recordings_unpause_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -467,7 +467,7 @@ static void ast_ari_unpause_recording_cb(
 		} else
 		{}
 	}
-	ast_ari_unpause_recording(headers, &args, response);
+	ast_ari_recordings_unpause(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -486,13 +486,13 @@ static void ast_ari_unpause_recording_cb(
 			is_valid = ast_ari_validate_void(
 				response->message);
 		} else {
-			ast_log(LOG_ERROR, "Invalid error response %d for /recordings/live/{recordingName}/unpause\n", code);
+			ast_log(LOG_ERROR, "Invalid error response %d for /recordings/live/{recordingName}/pause\n", code);
 			is_valid = 0;
 		}
 	}
 
 	if (!is_valid) {
-		ast_log(LOG_ERROR, "Response validation failed for /recordings/live/{recordingName}/unpause\n");
+		ast_log(LOG_ERROR, "Response validation failed for /recordings/live/{recordingName}/pause\n");
 		ast_ari_response_error(response, 500,
 			"Internal Server Error", "Response validation failed");
 	}
@@ -508,11 +508,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_mute_recording_cb(
+static void ast_ari_recordings_mute_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_mute_recording_args args = {};
+	struct ast_ari_recordings_mute_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -525,7 +525,7 @@ static void ast_ari_mute_recording_cb(
 		} else
 		{}
 	}
-	ast_ari_mute_recording(headers, &args, response);
+	ast_ari_recordings_mute(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -560,17 +560,17 @@ fin: __attribute__((unused))
 	return;
 }
 /*!
- * \brief Parameter parsing callback for /recordings/live/{recordingName}/unmute.
+ * \brief Parameter parsing callback for /recordings/live/{recordingName}/mute.
  * \param get_params GET parameters in the HTTP request.
  * \param path_vars Path variables extracted from the request.
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_unmute_recording_cb(
+static void ast_ari_recordings_unmute_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_unmute_recording_args args = {};
+	struct ast_ari_recordings_unmute_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -583,7 +583,7 @@ static void ast_ari_unmute_recording_cb(
 		} else
 		{}
 	}
-	ast_ari_unmute_recording(headers, &args, response);
+	ast_ari_recordings_unmute(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -602,13 +602,13 @@ static void ast_ari_unmute_recording_cb(
 			is_valid = ast_ari_validate_void(
 				response->message);
 		} else {
-			ast_log(LOG_ERROR, "Invalid error response %d for /recordings/live/{recordingName}/unmute\n", code);
+			ast_log(LOG_ERROR, "Invalid error response %d for /recordings/live/{recordingName}/mute\n", code);
 			is_valid = 0;
 		}
 	}
 
 	if (!is_valid) {
-		ast_log(LOG_ERROR, "Response validation failed for /recordings/live/{recordingName}/unmute\n");
+		ast_log(LOG_ERROR, "Response validation failed for /recordings/live/{recordingName}/mute\n");
 		ast_ari_response_error(response, 500,
 			"Internal Server Error", "Response validation failed");
 	}
@@ -623,8 +623,8 @@ static struct stasis_rest_handlers recordings_stored_recordingName = {
 	.path_segment = "recordingName",
 	.is_wildcard = 1,
 	.callbacks = {
-		[AST_HTTP_GET] = ast_ari_get_stored_recording_cb,
-		[AST_HTTP_DELETE] = ast_ari_delete_stored_recording_cb,
+		[AST_HTTP_GET] = ast_ari_recordings_get_stored_cb,
+		[AST_HTTP_DELETE] = ast_ari_recordings_delete_stored_cb,
 	},
 	.num_children = 0,
 	.children = {  }
@@ -633,7 +633,7 @@ static struct stasis_rest_handlers recordings_stored_recordingName = {
 static struct stasis_rest_handlers recordings_stored = {
 	.path_segment = "stored",
 	.callbacks = {
-		[AST_HTTP_GET] = ast_ari_get_stored_recordings_cb,
+		[AST_HTTP_GET] = ast_ari_recordings_list_stored_cb,
 	},
 	.num_children = 1,
 	.children = { &recordings_stored_recordingName, }
@@ -642,7 +642,7 @@ static struct stasis_rest_handlers recordings_stored = {
 static struct stasis_rest_handlers recordings_live_recordingName_stop = {
 	.path_segment = "stop",
 	.callbacks = {
-		[AST_HTTP_POST] = ast_ari_stop_recording_cb,
+		[AST_HTTP_POST] = ast_ari_recordings_stop_cb,
 	},
 	.num_children = 0,
 	.children = {  }
@@ -651,16 +651,8 @@ static struct stasis_rest_handlers recordings_live_recordingName_stop = {
 static struct stasis_rest_handlers recordings_live_recordingName_pause = {
 	.path_segment = "pause",
 	.callbacks = {
-		[AST_HTTP_POST] = ast_ari_pause_recording_cb,
-	},
-	.num_children = 0,
-	.children = {  }
-};
-/*! \brief REST handler for /api-docs/recordings.{format} */
-static struct stasis_rest_handlers recordings_live_recordingName_unpause = {
-	.path_segment = "unpause",
-	.callbacks = {
-		[AST_HTTP_POST] = ast_ari_unpause_recording_cb,
+		[AST_HTTP_POST] = ast_ari_recordings_pause_cb,
+		[AST_HTTP_DELETE] = ast_ari_recordings_unpause_cb,
 	},
 	.num_children = 0,
 	.children = {  }
@@ -669,16 +661,8 @@ static struct stasis_rest_handlers recordings_live_recordingName_unpause = {
 static struct stasis_rest_handlers recordings_live_recordingName_mute = {
 	.path_segment = "mute",
 	.callbacks = {
-		[AST_HTTP_POST] = ast_ari_mute_recording_cb,
-	},
-	.num_children = 0,
-	.children = {  }
-};
-/*! \brief REST handler for /api-docs/recordings.{format} */
-static struct stasis_rest_handlers recordings_live_recordingName_unmute = {
-	.path_segment = "unmute",
-	.callbacks = {
-		[AST_HTTP_POST] = ast_ari_unmute_recording_cb,
+		[AST_HTTP_POST] = ast_ari_recordings_mute_cb,
+		[AST_HTTP_DELETE] = ast_ari_recordings_unmute_cb,
 	},
 	.num_children = 0,
 	.children = {  }
@@ -688,11 +672,11 @@ static struct stasis_rest_handlers recordings_live_recordingName = {
 	.path_segment = "recordingName",
 	.is_wildcard = 1,
 	.callbacks = {
-		[AST_HTTP_GET] = ast_ari_get_live_recording_cb,
-		[AST_HTTP_DELETE] = ast_ari_cancel_recording_cb,
+		[AST_HTTP_GET] = ast_ari_recordings_get_live_cb,
+		[AST_HTTP_DELETE] = ast_ari_recordings_cancel_cb,
 	},
-	.num_children = 5,
-	.children = { &recordings_live_recordingName_stop,&recordings_live_recordingName_pause,&recordings_live_recordingName_unpause,&recordings_live_recordingName_mute,&recordings_live_recordingName_unmute, }
+	.num_children = 3,
+	.children = { &recordings_live_recordingName_stop,&recordings_live_recordingName_pause,&recordings_live_recordingName_mute, }
 };
 /*! \brief REST handler for /api-docs/recordings.{format} */
 static struct stasis_rest_handlers recordings_live = {
diff --git a/res/res_ari_sounds.c b/res/res_ari_sounds.c
index 0b817c309..62a34364e 100644
--- a/res/res_ari_sounds.c
+++ b/res/res_ari_sounds.c
@@ -58,11 +58,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_get_sounds_cb(
+static void ast_ari_sounds_list_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_get_sounds_args args = {};
+	struct ast_ari_sounds_list_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -78,7 +78,7 @@ static void ast_ari_get_sounds_cb(
 		} else
 		{}
 	}
-	ast_ari_get_sounds(headers, &args, response);
+	ast_ari_sounds_list(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -117,11 +117,11 @@ fin: __attribute__((unused))
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_get_stored_sound_cb(
+static void ast_ari_sounds_get_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_get_stored_sound_args args = {};
+	struct ast_ari_sounds_get_args args = {};
 	struct ast_variable *i;
 #if defined(AST_DEVMODE)
 	int is_valid;
@@ -134,7 +134,7 @@ static void ast_ari_get_stored_sound_cb(
 		} else
 		{}
 	}
-	ast_ari_get_stored_sound(headers, &args, response);
+	ast_ari_sounds_get(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -172,7 +172,7 @@ static struct stasis_rest_handlers sounds_soundId = {
 	.path_segment = "soundId",
 	.is_wildcard = 1,
 	.callbacks = {
-		[AST_HTTP_GET] = ast_ari_get_stored_sound_cb,
+		[AST_HTTP_GET] = ast_ari_sounds_get_cb,
 	},
 	.num_children = 0,
 	.children = {  }
@@ -181,7 +181,7 @@ static struct stasis_rest_handlers sounds_soundId = {
 static struct stasis_rest_handlers sounds = {
 	.path_segment = "sounds",
 	.callbacks = {
-		[AST_HTTP_GET] = ast_ari_get_sounds_cb,
+		[AST_HTTP_GET] = ast_ari_sounds_list_cb,
 	},
 	.num_children = 1,
 	.children = { &sounds_soundId, }
diff --git a/rest-api-templates/ari_resource.c.mustache b/rest-api-templates/ari_resource.c.mustache
index cdbd283e4..5015d347e 100644
--- a/rest-api-templates/ari_resource.c.mustache
+++ b/rest-api-templates/ari_resource.c.mustache
@@ -33,19 +33,19 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 {{#apis}}
 {{#operations}}
 {{#is_req}}
-void ast_ari_{{c_nickname}}(struct ast_variable *headers,
-	struct ast_{{c_nickname}}_args *args,
+void ast_ari_{{c_name}}_{{c_nickname}}(struct ast_variable *headers,
+	struct ast_ari_{{c_name}}_{{c_nickname}}_args *args,
 	struct ast_ari_response *response)
 {
-	ast_log(LOG_ERROR, "TODO: ast_ari_{{c_nickname}}\n");
+	ast_log(LOG_ERROR, "TODO: ast_ari_{{c_name}}_{{c_nickname}}\n");
 }
 {{/is_req}}
 {{#is_websocket}}
-void ast_ari_websocket_{{c_nickname}}(struct ast_ari_websocket_session *session,
+void ast_ari_websocket_{{c_name}}_{{c_nickname}}(struct ast_ari_websocket_session *session,
 	struct ast_variable *headers,
-	struct ast_{{c_nickname}}_args *args)
+	struct ast_ari_{{c_name}}_{{c_nickname}}_args *args)
 {
-	ast_log(LOG_ERROR, "TODO: ast_ari_websocket_{{c_nickname}}\n");
+	ast_log(LOG_ERROR, "TODO: ast_ari_websocket_{{c_name}}_{{c_nickname}}\n");
 }
 {{/is_websocket}}
 {{/operations}}
diff --git a/rest-api-templates/ari_resource.h.mustache b/rest-api-templates/ari_resource.h.mustache
index 8b4b0acec..e389eb5d7 100644
--- a/rest-api-templates/ari_resource.h.mustache
+++ b/rest-api-templates/ari_resource.h.mustache
@@ -40,8 +40,8 @@
 
 {{#apis}}
 {{#operations}}
-/*! \brief Argument struct for ast_ari_{{c_nickname}}() */
-struct ast_{{c_nickname}}_args {
+/*! \brief Argument struct for ast_ari_{{c_name}}_{{c_nickname}}() */
+struct ast_ari_{{c_name}}_{{c_nickname}}_args {
 {{#parameters}}
 {{#description}}
 {{/description}}
@@ -73,7 +73,7 @@ struct ast_{{c_nickname}}_args {
  * \param args Swagger parameters
  * \param[out] response HTTP response
  */
-void ast_ari_{{c_nickname}}(struct ast_variable *headers, struct ast_{{c_nickname}}_args *args, struct ast_ari_response *response);
+void ast_ari_{{c_name}}_{{c_nickname}}(struct ast_variable *headers, struct ast_ari_{{c_name}}_{{c_nickname}}_args *args, struct ast_ari_response *response);
 {{/is_req}}
 {{#is_websocket}}
 /*!
@@ -87,7 +87,7 @@ void ast_ari_{{c_nickname}}(struct ast_variable *headers, struct ast_{{c_nicknam
  * \param headers HTTP headers.
  * \param args Swagger parameters.
  */
-void ast_ari_websocket_{{c_nickname}}(struct ast_ari_websocket_session *session, struct ast_variable *headers, struct ast_{{c_nickname}}_args *args);
+void ast_ari_websocket_{{c_name}}_{{c_nickname}}(struct ast_ari_websocket_session *session, struct ast_variable *headers, struct ast_ari_{{c_name}}_{{c_nickname}}_args *args);
 {{/is_websocket}}
 {{/operations}}
 {{/apis}}
diff --git a/rest-api-templates/asterisk_processor.py b/rest-api-templates/asterisk_processor.py
index e7a0b5fd1..18044f57e 100644
--- a/rest-api-templates/asterisk_processor.py
+++ b/rest-api-templates/asterisk_processor.py
@@ -157,6 +157,7 @@ class AsteriskProcessor(SwaggerPostProcessor):
         # Now in all caps, for include guard
         resource_api.name_caps = resource_api.name.upper()
         resource_api.name_title = resource_api.name.capitalize()
+        resource_api.c_name = snakify(resource_api.name)
         # Construct the PathSegement tree for the API.
         if resource_api.api_declaration:
             resource_api.root_path = PathSegment('', None)
@@ -182,7 +183,7 @@ class AsteriskProcessor(SwaggerPostProcessor):
         api.wiki_path = wikify(api.path)
 
     def process_operation(self, operation, context):
-        # Nicknames are camelcase, Asterisk coding is snake case
+        # Nicknames are camelCase, Asterisk coding is snake case
         operation.c_nickname = snakify(operation.nickname)
         operation.c_http_method = 'AST_HTTP_' + operation.http_method
         if not operation.summary.endswith("."):
diff --git a/rest-api-templates/res_ari_resource.c.mustache b/rest-api-templates/res_ari_resource.c.mustache
index 8e043e682..06b493cc4 100644
--- a/rest-api-templates/res_ari_resource.c.mustache
+++ b/rest-api-templates/res_ari_resource.c.mustache
@@ -73,11 +73,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_{{c_nickname}}_cb(
+static void ast_ari_{{c_name}}_{{c_nickname}}_cb(
 	struct ast_variable *get_params, struct ast_variable *path_vars,
 	struct ast_variable *headers, struct ast_ari_response *response)
 {
-	struct ast_{{c_nickname}}_args args = {};
+	struct ast_ari_{{c_name}}_{{c_nickname}}_args args = {};
 {{#has_parameters}}
 	struct ast_variable *i;
 {{/has_parameters}}
@@ -87,7 +87,7 @@ static void ast_ari_{{c_nickname}}_cb(
 #endif /* AST_DEVMODE */
 
 {{> param_parsing}}
-	ast_ari_{{c_nickname}}(headers, &args, response);
+	ast_ari_{{c_name}}_{{c_nickname}}(headers, &args, response);
 #if defined(AST_DEVMODE)
 	code = response->response_code;
 
@@ -133,10 +133,10 @@ fin: __attribute__((unused))
 }
 {{/is_req}}
 {{#is_websocket}}
-static void ast_ari_{{c_nickname}}_ws_cb(struct ast_websocket *ws_session,
+static void ast_ari_{{c_name}}_{{c_nickname}}_ws_cb(struct ast_websocket *ws_session,
 	struct ast_variable *get_params, struct ast_variable *headers)
 {
-	struct ast_{{c_nickname}}_args args = {};
+	struct ast_ari_{{c_name}}_{{c_nickname}}_args args = {};
 {{#has_parameters}}
 	RAII_VAR(struct ast_ari_response *, response, NULL, ast_free);
 	struct ast_variable *i;
@@ -171,7 +171,7 @@ static void ast_ari_{{c_nickname}}_ws_cb(struct ast_websocket *ws_session,
 
 {{> param_parsing}}
 
-	ast_ari_websocket_{{c_nickname}}(session, headers, &args);
+	ast_ari_websocket_{{c_name}}_{{c_nickname}}(session, headers, &args);
 
 fin: __attribute__((unused))
 	if (response && response->response_code != 0) {
@@ -216,7 +216,7 @@ static int load_module(void)
 {{#operations}}
 {{#is_websocket}}
 	res |= ast_websocket_server_add_protocol({{full_name}}.ws_server,
-		"{{websocket_protocol}}", ast_ari_{{c_nickname}}_ws_cb);
+		"{{websocket_protocol}}", ast_ari_{{c_name}}_{{c_nickname}}_ws_cb);
 {{/is_websocket}}
 {{/operations}}
 {{/apis}}
diff --git a/rest-api-templates/rest_handler.mustache b/rest-api-templates/rest_handler.mustache
index ceff6a72d..baa1aa65d 100644
--- a/rest-api-templates/rest_handler.mustache
+++ b/rest-api-templates/rest_handler.mustache
@@ -31,7 +31,7 @@ static struct stasis_rest_handlers {{full_name}} = {
 	.callbacks = {
 {{#operations}}
 {{#is_req}}
-		[{{c_http_method}}] = ast_ari_{{c_nickname}}_cb,
+		[{{c_http_method}}] = ast_ari_{{c_name}}_{{c_nickname}}_cb,
 {{/is_req}}
 {{/operations}}
 	},
diff --git a/rest-api-templates/swagger_model.py b/rest-api-templates/swagger_model.py
index be98c4a3c..144f22bdb 100644
--- a/rest-api-templates/swagger_model.py
+++ b/rest-api-templates/swagger_model.py
@@ -631,6 +631,11 @@ class ApiDeclaration(Stringify):
         api_json = api_decl_json.get('apis') or []
         self.apis = [
             Api().load(j, processor, context) for j in api_json]
+        paths = set()
+        for api in self.apis:
+            if api.path in paths:
+                raise SwaggerError("API with duplicated path: %s" % api.path, context)
+            paths.add(api.path)
         self.has_websocket = filter(lambda api: api.has_websocket,
                                     self.apis) == []
         models = api_decl_json.get('models').items() or []
diff --git a/rest-api/api-docs/applications.json b/rest-api/api-docs/applications.json
index 182f1e0c3..494088dc5 100644
--- a/rest-api/api-docs/applications.json
+++ b/rest-api/api-docs/applications.json
@@ -14,7 +14,7 @@
 				{
 					"httpMethod": "GET",
 					"summary": "List all applications.",
-					"nickname": "getApplications",
+					"nickname": "list",
 					"responseClass": "List[Application]"
 				}
 			]
@@ -26,7 +26,7 @@
 				{
 					"httpMethod": "GET",
 					"summary": "Get details of an application.",
-					"nickname": "getApplication",
+					"nickname": "get",
 					"responseClass": "Application",
 					"parameters": [
 						{
@@ -55,7 +55,7 @@
 					"httpMethod": "POST",
 					"summary": "Subscribe an application to a event source.",
 					"notes": "Returns the state of the application after the subscriptions have changed",
-					"nickname": "applicationSubscribe",
+					"nickname": "subscribe",
 					"responseClass": "Application",
 					"parameters": [
 						{
@@ -94,7 +94,7 @@
 					"httpMethod": "DELETE",
 					"summary": "Unsubscribe an application from an event source.",
 					"notes": "Returns the state of the application after the subscriptions have changed",
-					"nickname": "applicationUnsubscribe",
+					"nickname": "unsubscribe",
 					"responseClass": "Application",
 					"parameters": [
 						{
diff --git a/rest-api/api-docs/asterisk.json b/rest-api/api-docs/asterisk.json
index fe0953951..8b4483271 100644
--- a/rest-api/api-docs/asterisk.json
+++ b/rest-api/api-docs/asterisk.json
@@ -14,7 +14,7 @@
 				{
 					"httpMethod": "GET",
 					"summary": "Gets Asterisk system information.",
-					"nickname": "getAsteriskInfo",
+					"nickname": "getInfo",
 					"responseClass": "AsteriskInfo",
 					"parameters": [
 						{
diff --git a/rest-api/api-docs/bridges.json b/rest-api/api-docs/bridges.json
index 3174eaaa3..2339a9671 100644
--- a/rest-api/api-docs/bridges.json
+++ b/rest-api/api-docs/bridges.json
@@ -14,14 +14,14 @@
 				{
 					"httpMethod": "GET",
 					"summary": "List all active bridges in Asterisk.",
-					"nickname": "getBridges",
+					"nickname": "list",
 					"responseClass": "List[Bridge]"
 				},
 				{
 					"httpMethod": "POST",
 					"summary": "Create a new bridge.",
 					"notes": "This bridge persists until it has been shut down, or Asterisk has been shut down.",
-					"nickname": "newBridge",
+					"nickname": "create",
 					"responseClass": "Bridge",
 					"parameters": [
 						{
@@ -50,7 +50,7 @@
 				{
 					"httpMethod": "GET",
 					"summary": "Get bridge details.",
-					"nickname": "getBridge",
+					"nickname": "get",
 					"responseClass": "Bridge",
 					"parameters": [
 						{
@@ -73,7 +73,7 @@
 					"httpMethod": "DELETE",
 					"summary": "Shut down a bridge.",
 					"notes": "If any channels are in this bridge, they will be removed and resume whatever they were doing beforehand.",
-					"nickname": "deleteBridge",
+					"nickname": "destroy",
 					"responseClass": "void",
 					"parameters": [
 						{
@@ -101,7 +101,7 @@
 				{
 					"httpMethod": "POST",
 					"summary": "Add a channel to a bridge.",
-					"nickname": "addChannelToBridge",
+					"nickname": "addChannel",
 					"responseClass": "void",
 					"parameters": [
 						{
@@ -157,7 +157,7 @@
 				{
 					"httpMethod": "POST",
 					"summary": "Remove a channel from a bridge.",
-					"nickname": "removeChannelFromBridge",
+					"nickname": "removeChannel",
 					"responseClass": "void",
 					"parameters": [
 						{
@@ -205,7 +205,7 @@
 				{
 					"httpMethod": "POST",
 					"summary": "Play music on hold to a bridge or change the MOH class that is playing.",
-					"nickname": "mohStartBridge",
+					"nickname": "startMoh",
 					"responseClass": "void",
 					"parameters": [
 						{
@@ -235,18 +235,12 @@
 							"reason": "Bridge not in Stasis application"
 						}
 					]
-				}
-			]
-		},
-		{
-			"path": "/bridges/{bridgeId}/moh",
-			"description": "Stop music on hold for a bridge",
-			"operations": [
+				},
 				{
 					"httpMethod": "DELETE",
 					"summary": "Stop playing music on hold to a bridge.",
-					"notes": "This will only stop music on hold being played via bridges/{bridgeId}/mohStart.",
-					"nickname": "mohStopBridge",
+					"notes": "This will only stop music on hold being played via POST bridges/{bridgeId}/moh.",
+					"nickname": "stopMoh",
 					"responseClass": "void",
 					"parameters": [
 						{
@@ -279,7 +273,7 @@
 					"httpMethod": "POST",
 					"summary": "Start playback of media on a bridge.",
 					"notes": "The media URI may be any of a number of URI's. Currently sound: and recording: URI's are supported. This operation creates a playback resource that can be used to control the playback of media (pause, rewind, fast forward, etc.)",
-					"nickname": "playOnBridge",
+					"nickname": "play",
 					"responseClass": "Playback",
 					"parameters": [
 						{
@@ -356,7 +350,7 @@
 					"httpMethod": "POST",
 					"summary": "Start a recording.",
 					"notes": "This records the mixed audio from all channels participating in this bridge.",
-					"nickname": "recordBridge",
+					"nickname": "record",
 					"responseClass": "LiveRecording",
 					"parameters": [
 						{
diff --git a/rest-api/api-docs/channels.json b/rest-api/api-docs/channels.json
index 02284385e..d3ed5194d 100644
--- a/rest-api/api-docs/channels.json
+++ b/rest-api/api-docs/channels.json
@@ -14,7 +14,7 @@
 				{
 					"httpMethod": "GET",
 					"summary": "List all active channels in Asterisk.",
-					"nickname": "getChannels",
+					"nickname": "list",
 					"responseClass": "List[Channel]"
 				},
 				{
@@ -106,7 +106,7 @@
 				{
 					"httpMethod": "GET",
 					"summary": "Channel details.",
-					"nickname": "getChannel",
+					"nickname": "get",
 					"responseClass": "Channel",
 					"parameters": [
 						{
@@ -128,7 +128,7 @@
 				{
 					"httpMethod": "DELETE",
 					"summary": "Delete (i.e. hangup) a channel.",
-					"nickname": "deleteChannel",
+					"nickname": "hangup",
 					"responseClass": "void",
 					"parameters": [
 						{
@@ -233,7 +233,7 @@
 				{
 					"httpMethod": "POST",
 					"summary": "Answer a channel.",
-					"nickname": "answerChannel",
+					"nickname": "answer",
 					"responseClass": "void",
 					"parameters": [
 						{
@@ -265,7 +265,7 @@
 				{
 					"httpMethod": "POST",
 					"summary": "Indicate ringing to a channel.",
-					"nickname": "ringChannel",
+					"nickname": "ring",
 					"responseClass": "void",
 					"parameters": [
 						{
@@ -297,7 +297,7 @@
 				{
 					"httpMethod": "POST",
 					"summary": "Send provided DTMF to a given channel.",
-					"nickname": "sendDTMFChannel",
+					"nickname": "sendDTMF",
 					"responseClass": "void",
 					"parameters": [
 						{
@@ -377,7 +377,7 @@
 				{
 					"httpMethod": "POST",
 					"summary": "Mute a channel.",
-					"nickname": "muteChannel",
+					"nickname": "mute",
 					"responseClass": "void",
 					"parameters": [
 						{
@@ -416,17 +416,11 @@
 							"reason": "Channel not in a Stasis application"
 						}
 					]
-				}
-			]
-		},
-		{
-			"path": "/channels/{channelId}/unmute",
-			"description": "Unmute a channel",
-			"operations": [
+				},
 				{
-					"httpMethod": "POST",
+					"httpMethod": "DELETE",
 					"summary": "Unmute a channel.",
-					"nickname": "unmuteChannel",
+					"nickname": "unmute",
 					"responseClass": "void",
 					"parameters": [
 						{
@@ -475,7 +469,7 @@
 				{
 					"httpMethod": "POST",
 					"summary": "Hold a channel.",
-					"nickname": "holdChannel",
+					"nickname": "hold",
 					"responseClass": "void",
 					"parameters": [
 						{
@@ -497,17 +491,11 @@
 							"reason": "Channel not in a Stasis application"
 						}
 					]
-				}
-			]
-		},
-		{
-			"path": "/channels/{channelId}/hold",
-			"description": "Remove a channel from hold",
-			"operations": [
+				},
 				{
 					"httpMethod": "DELETE",
 					"summary": "Remove a channel from hold.",
-					"nickname": "unholdChannel",
+					"nickname": "unhold",
 					"responseClass": "void",
 					"parameters": [
 						{
@@ -540,7 +528,7 @@
 					"httpMethod": "POST",
 					"summary": "Play music on hold to a channel.",
 					"notes": "Using media operations such as playOnChannel on a channel playing MOH in this manner will suspend MOH without resuming automatically. If continuing music on hold is desired, the stasis application must reinitiate music on hold.",
-					"nickname": "mohStartChannel",
+					"nickname": "startMoh",
 					"responseClass": "void",
 					"parameters": [
 						{
@@ -570,17 +558,11 @@
 							"reason": "Channel not in a Stasis application"
 						}
 					]
-				}
-			]
-		},
-		{
-			"path": "/channels/{channelId}/moh",
-			"description": "Stop playing music on hold to a channel",
-			"operations": [
+				},
 				{
 					"httpMethod": "DELETE",
 					"summary": "Stop playing music on hold to a channel.",
-					"nickname": "mohStopChannel",
+					"nickname": "stopMoh",
 					"responseClass": "void",
 					"parameters": [
 						{
@@ -613,7 +595,7 @@
 					"httpMethod": "POST",
 					"summary": "Start playback of media.",
 					"notes": "The media URI may be any of a number of URI's. Currently sound: and recording: URI's are supported. This operation creates a playback resource that can be used to control the playback of media (pause, rewind, fast forward, etc.)",
-					"nickname": "playOnChannel",
+					"nickname": "play",
 					"responseClass": "Playback",
 					"parameters": [
 						{
@@ -679,7 +661,7 @@
 					"httpMethod": "POST",
 					"summary": "Start a recording.",
 					"notes": "Record audio from a channel. Note that this will not capture audio sent to the channel. The bridge itself has a record feature if that's what you want.",
-					"nickname": "recordChannel",
+					"nickname": "record",
 					"responseClass": "LiveRecording",
 					"parameters": [
 						{
diff --git a/rest-api/api-docs/endpoints.json b/rest-api/api-docs/endpoints.json
index 7663a594b..c44e3dd7e 100644
--- a/rest-api/api-docs/endpoints.json
+++ b/rest-api/api-docs/endpoints.json
@@ -14,7 +14,7 @@
 				{
 					"httpMethod": "GET",
 					"summary": "List all endpoints.",
-					"nickname": "getEndpoints",
+					"nickname": "list",
 					"responseClass": "List[Endpoint]"
 				}
 			]
@@ -26,7 +26,7 @@
 				{
 					"httpMethod": "GET",
 					"summary": "List available endoints for a given endpoint technology.",
-					"nickname": "getEndpointsByTech",
+					"nickname": "listByTech",
 					"responseClass": "List[Endpoint]",
 					"parameters": [
 						{
@@ -46,7 +46,7 @@
 				{
 					"httpMethod": "GET",
 					"summary": "Details for an endpoint.",
-					"nickname": "getEndpoint",
+					"nickname": "get",
 					"responseClass": "Endpoint",
 					"parameters": [
 						{
diff --git a/rest-api/api-docs/playback.json b/rest-api/api-docs/playback.json
index 880aaa046..92810d30a 100644
--- a/rest-api/api-docs/playback.json
+++ b/rest-api/api-docs/playback.json
@@ -14,7 +14,7 @@
 				{
 					"httpMethod": "GET",
 					"summary": "Get a playback's details.",
-					"nickname": "getPlayback",
+					"nickname": "get",
 					"responseClass": "Playback",
 					"parameters": [
 						{
@@ -36,7 +36,7 @@
 				{
 					"httpMethod": "DELETE",
 					"summary": "Stop a playback.",
-					"nickname": "stopPlayback",
+					"nickname": "stop",
 					"responseClass": "void",
 					"parameters": [
 						{
@@ -64,7 +64,7 @@
 				{
 					"httpMethod": "POST",
 					"summary": "Control a playback.",
-					"nickname": "controlPlayback",
+					"nickname": "control",
 					"responseClass": "void",
 					"parameters": [
 						{
diff --git a/rest-api/api-docs/recordings.json b/rest-api/api-docs/recordings.json
index 93340c10e..590a1b84d 100644
--- a/rest-api/api-docs/recordings.json
+++ b/rest-api/api-docs/recordings.json
@@ -14,7 +14,7 @@
 				{
 					"httpMethod": "GET",
 					"summary": "List recordings that are complete.",
-					"nickname": "getStoredRecordings",
+					"nickname": "listStored",
 					"responseClass": "List[StoredRecording]"
 				}
 			]
@@ -26,7 +26,7 @@
 				{
 					"httpMethod": "GET",
 					"summary": "Get a stored recording's details.",
-					"nickname": "getStoredRecording",
+					"nickname": "getStored",
 					"responseClass": "StoredRecording",
 					"parameters": [
 						{
@@ -48,7 +48,7 @@
 				{
 					"httpMethod": "DELETE",
 					"summary": "Delete a stored recording.",
-					"nickname": "deleteStoredRecording",
+					"nickname": "deleteStored",
 					"responseClass": "void",
 					"parameters": [
 						{
@@ -76,7 +76,7 @@
 				{
 					"httpMethod": "GET",
 					"summary": "List live recordings.",
-					"nickname": "getLiveRecording",
+					"nickname": "getLive",
 					"responseClass": "LiveRecording",
 					"parameters": [
 						{
@@ -98,7 +98,7 @@
 				{
 					"httpMethod": "DELETE",
 					"summary": "Stop a live recording and discard it.",
-					"nickname": "cancelRecording",
+					"nickname": "cancel",
 					"responseClass": "void",
 					"parameters": [
 						{
@@ -125,7 +125,7 @@
 				{
 					"httpMethod": "POST",
 					"summary": "Stop a live recording and store it.",
-					"nickname": "stopRecording",
+					"nickname": "stop",
 					"responseClass": "void",
 					"parameters": [
 						{
@@ -153,7 +153,7 @@
 					"httpMethod": "POST",
 					"summary": "Pause a live recording.",
 					"notes": "Pausing a recording suspends silence detection, which will be restarted when the recording is unpaused. Paused time is not included in the accounting for maxDurationSeconds.",
-					"nickname": "pauseRecording",
+					"nickname": "pause",
 					"responseClass": "void",
 					"parameters": [
 						{
@@ -175,16 +175,11 @@
 							"reason": "Recording not in session"
 						}
 					]
-				}
-			]
-		},
-		{
-			"path": "/recordings/live/{recordingName}/unpause",
-			"operations": [
+				},
 				{
-					"httpMethod": "POST",
+					"httpMethod": "DELETE",
 					"summary": "Unpause a live recording.",
-					"nickname": "unpauseRecording",
+					"nickname": "unpause",
 					"responseClass": "void",
 					"parameters": [
 						{
@@ -216,7 +211,7 @@
 					"httpMethod": "POST",
 					"summary": "Mute a live recording.",
 					"notes": "Muting a recording suspends silence detection, which will be restarted when the recording is unmuted.",
-					"nickname": "muteRecording",
+					"nickname": "mute",
 					"responseClass": "void",
 					"parameters": [
 						{
@@ -238,16 +233,11 @@
 							"reason": "Recording not in session"
 						}
 					]
-				}
-			]
-		},
-		{
-			"path": "/recordings/live/{recordingName}/unmute",
-			"operations": [
+				},
 				{
-					"httpMethod": "POST",
+					"httpMethod": "DELETE",
 					"summary": "Unmute a live recording.",
-					"nickname": "unmuteRecording",
+					"nickname": "unmute",
 					"responseClass": "void",
 					"parameters": [
 						{
diff --git a/rest-api/api-docs/sounds.json b/rest-api/api-docs/sounds.json
index fe0b09fd4..1de71c3a1 100644
--- a/rest-api/api-docs/sounds.json
+++ b/rest-api/api-docs/sounds.json
@@ -14,7 +14,7 @@
 				{
 					"httpMethod": "GET",
 					"summary": "List all sounds.",
-					"nickname": "getSounds",
+					"nickname": "list",
 					"responseClass": "List[Sound]",
 					"parameters": [
 						{
@@ -43,7 +43,7 @@
 				{
 					"httpMethod": "GET",
 					"summary": "Get a sound's details.",
-					"nickname": "getStoredSound",
+					"nickname": "get",
 					"responseClass": "Sound",
 					"parameters": [
 						{