From b0f3e6097e7e40affba1f893c42be66a8d26bd23 Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Fri, 19 Oct 2007 18:29:40 +0000
Subject: [PATCH] Convert NEW_CLI to AST_CLI.

Closes issue #11039, as suggested by seanbright.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86536 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 apps/app_meetme.c         |  6 ++---
 apps/app_minivm.c         | 12 +++++-----
 apps/app_mixmonitor.c     |  2 +-
 apps/app_osplookup.c      |  2 +-
 apps/app_playback.c       |  6 ++---
 apps/app_queue.c          |  8 +++----
 apps/app_rpt.c            | 12 +++++-----
 apps/app_voicemail.c      |  4 ++--
 channels/chan_agent.c     |  6 ++---
 channels/chan_alsa.c      | 10 ++++----
 channels/chan_features.c  |  2 +-
 channels/chan_gtalk.c     |  4 ++--
 channels/chan_h323.c      | 12 +++++-----
 channels/chan_iax2.c      | 50 +++++++++++++++++++--------------------
 channels/chan_jingle.c    |  4 ++--
 channels/chan_local.c     |  2 +-
 channels/chan_mgcp.c      | 10 ++++----
 channels/chan_misdn.c     | 42 ++++++++++++++++----------------
 channels/chan_oss.c       | 20 ++++++++--------
 channels/chan_sip.c       | 38 ++++++++++++++---------------
 channels/chan_skinny.c    | 16 ++++++-------
 channels/chan_usbradio.c  |  8 +++----
 channels/chan_zap.c       | 40 +++++++++++++++----------------
 channels/iax2-provision.c |  2 +-
 codecs/codec_zap.c        |  2 +-
 funcs/func_devstate.c     |  2 +-
 include/asterisk/cli.h    |  4 ++--
 main/asterisk.c           | 34 +++++++++++++-------------
 main/astmm.c              |  4 ++--
 main/astobj2.c            |  4 ++--
 main/cdr.c                |  4 ++--
 main/channel.c            |  4 ++--
 main/cli.c                | 42 ++++++++++++++++----------------
 main/config.c             |  2 +-
 main/db.c                 | 12 +++++-----
 main/dnsmgr.c             |  6 ++---
 main/file.c               |  2 +-
 main/frame.c              |  6 ++---
 main/http.c               |  2 +-
 main/image.c              |  2 +-
 main/logger.c             |  6 ++---
 main/manager.c            | 14 +++++------
 main/pbx.c                | 18 +++++++-------
 main/rtp.c                |  8 +++----
 main/threadstorage.c      |  4 ++--
 main/translate.c          |  2 +-
 main/udptl.c              |  6 ++---
 main/utils.c              |  2 +-
 pbx/pbx_ael.c             |  4 ++--
 pbx/pbx_config.c          | 16 ++++++-------
 pbx/pbx_dundi.c           | 30 +++++++++++------------
 res/res_agi.c             |  6 ++---
 res/res_clioriginate.c    |  2 +-
 res/res_config_pgsql.c    |  2 +-
 res/res_config_sqlite.c   |  2 +-
 res/res_convert.c         |  2 +-
 res/res_crypto.c          |  4 ++--
 res/res_features.c        |  6 ++---
 res/res_indications.c     |  6 ++---
 res/res_jabber.c          | 12 +++++-----
 res/res_limit.c           |  2 +-
 res/res_musiconhold.c     |  6 ++---
 res/res_odbc.c            |  2 +-
 res/res_realtime.c        |  4 ++--
 64 files changed, 308 insertions(+), 308 deletions(-)

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index f5c6ba53ce..56a3f6176e 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1244,9 +1244,9 @@ static char *sla_show_stations(struct ast_cli_entry *e, int cmd, struct ast_cli_
 }
 
 static struct ast_cli_entry cli_meetme[] = {
-	NEW_CLI(meetme_cmd, "Execute a command on a conference or conferee"),
-	NEW_CLI(sla_show_trunks, "Show SLA Trunks"),
-	NEW_CLI(sla_show_stations, "Show SLA Stations"),
+	AST_CLI(meetme_cmd, "Execute a command on a conference or conferee"),
+	AST_CLI(sla_show_trunks, "Show SLA Trunks"),
+	AST_CLI(sla_show_stations, "Show SLA Stations"),
 };
 
 static void conf_flush(int fd, struct ast_channel *chan)
diff --git a/apps/app_minivm.c b/apps/app_minivm.c
index 0e9805975a..462b7e7b7f 100644
--- a/apps/app_minivm.c
+++ b/apps/app_minivm.c
@@ -2991,12 +2991,12 @@ static int minivm_counter_func_write(struct ast_channel *chan, const char *cmd,
 
 /*! \brief CLI commands for Mini-voicemail */
 static struct ast_cli_entry cli_minivm[] = {
-	NEW_CLI(handle_minivm_show_users, "List defined mini-voicemail boxes"),
-	NEW_CLI(handle_minivm_show_zones, "List zone message formats"),
-	NEW_CLI(handle_minivm_list_templates, "List message templates"),	
-	NEW_CLI(handle_minivm_reload, "Reload Mini-voicemail configuration"),
-	NEW_CLI(handle_minivm_show_stats, "Show some mini-voicemail statistics"),
-	NEW_CLI(handle_minivm_show_settings, "Show mini-voicemail general settings"),
+	AST_CLI(handle_minivm_show_users, "List defined mini-voicemail boxes"),
+	AST_CLI(handle_minivm_show_zones, "List zone message formats"),
+	AST_CLI(handle_minivm_list_templates, "List message templates"),	
+	AST_CLI(handle_minivm_reload, "Reload Mini-voicemail configuration"),
+	AST_CLI(handle_minivm_show_stats, "Show some mini-voicemail statistics"),
+	AST_CLI(handle_minivm_show_settings, "Show mini-voicemail general settings"),
 };
 
 static struct ast_custom_function minivm_counter_function = {
diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index ca775f163c..f328aadd1b 100644
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -399,7 +399,7 @@ static char *handle_cli_mixmonitor(struct ast_cli_entry *e, int cmd, struct ast_
 }
 
 static struct ast_cli_entry cli_mixmonitor[] = {
-	NEW_CLI(handle_cli_mixmonitor, "Execute a MixMonitor command")
+	AST_CLI(handle_cli_mixmonitor, "Execute a MixMonitor command")
 };
 
 static int unload_module(void)
diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index 44f85b0c97..5455e0f085 100644
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -2000,7 +2000,7 @@ static const char* descrip4 =
 "		SUCCESS | FAILED | ERROR \n";
 
 static struct ast_cli_entry cli_osp[] = {
-	NEW_CLI(handle_cli_osp_show, "Displays OSF information")
+	AST_CLI(handle_cli_osp_show, "Displays OSF information")
 };
 
 static int load_module(void)
diff --git a/apps/app_playback.c b/apps/app_playback.c
index 01fafa7d67..d23235dfaf 100644
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -395,9 +395,9 @@ static char *__say_cli_init(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
 }
 
 static struct ast_cli_entry cli_playback[] = {
-	NEW_CLI(__say_cli_init, "Set or show the say mode"),
-	NEW_CLI(__say_cli_init, "Set the say mode"),
-	NEW_CLI(__say_cli_init, "Set the say mode"),
+	AST_CLI(__say_cli_init, "Set or show the say mode"),
+	AST_CLI(__say_cli_init, "Set the say mode"),
+	AST_CLI(__say_cli_init, "Set the say mode"),
 };
 
 static int playback_exec(struct ast_channel *chan, void *data)
diff --git a/apps/app_queue.c b/apps/app_queue.c
index bc1b5d4b61..96fc2bd5d2 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -5004,10 +5004,10 @@ static const char qum_cmd_usage[] =
 "Usage: queue unpause member <channel> in <queue> reason <reason>\n";
 
 static struct ast_cli_entry cli_queue[] = {
-	NEW_CLI(queue_show, "Show status of a specified queue"),
-	NEW_CLI(handle_queue_add_member, "Add a channel to a specified queue"),
-	NEW_CLI(handle_queue_remove_member, "Removes a channel from a specified queue"),
-	NEW_CLI(handle_queue_pause_member, "Pause or unpause a queue member"),
+	AST_CLI(queue_show, "Show status of a specified queue"),
+	AST_CLI(handle_queue_add_member, "Add a channel to a specified queue"),
+	AST_CLI(handle_queue_remove_member, "Removes a channel from a specified queue"),
+	AST_CLI(handle_queue_pause_member, "Pause or unpause a queue member"),
 };
 
 static int unload_module(void)
diff --git a/apps/app_rpt.c b/apps/app_rpt.c
index 1f77cee3a5..7ea02ac0f6 100644
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -706,12 +706,12 @@ static char *handle_cli_rpt_reload(struct ast_cli_entry *e, int cmd, struct ast_
 static char *handle_cli_rpt_restart(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
 
 static struct ast_cli_entry cli_rpt[] = {
-	NEW_CLI(handle_cli_rpt_debug_level, "Enable app_rpt debuggin"),
-	NEW_CLI(handle_cli_rpt_dump,        "Dump app_rpt structs for debugging"),
-	NEW_CLI(handle_cli_rpt_stats,       "Dump node statistics"),
-	NEW_CLI(handle_cli_rpt_lstats,      "Dump link statistics"),
-	NEW_CLI(handle_cli_rpt_reload,      "Reload app_rpt config"),
-	NEW_CLI(handle_cli_rpt_restart,     "Restart app_rpt")
+	AST_CLI(handle_cli_rpt_debug_level, "Enable app_rpt debuggin"),
+	AST_CLI(handle_cli_rpt_dump,        "Dump app_rpt structs for debugging"),
+	AST_CLI(handle_cli_rpt_stats,       "Dump node statistics"),
+	AST_CLI(handle_cli_rpt_lstats,      "Dump link statistics"),
+	AST_CLI(handle_cli_rpt_reload,      "Reload app_rpt config"),
+	AST_CLI(handle_cli_rpt_restart,     "Restart app_rpt")
 };
 
 /*
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index cb90289001..6fbb5b1db9 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -7735,8 +7735,8 @@ static char *handle_voicemail_show_zones(struct ast_cli_entry *e, int cmd, struc
 }
 
 static struct ast_cli_entry cli_voicemail[] = {
-	NEW_CLI(handle_voicemail_show_users, "List defined voicemail boxes"),
-	NEW_CLI(handle_voicemail_show_zones, "List zone message formats"),
+	AST_CLI(handle_voicemail_show_users, "List defined voicemail boxes"),
+	AST_CLI(handle_voicemail_show_zones, "List zone message formats"),
 };
 
 static void poll_subscribed_mailboxes(void)
diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index f3fdd19f02..97f0c46be5 100644
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -1765,9 +1765,9 @@ static const char agent_logoff_usage[] =
 "       If 'soft' is specified, do not hangup existing calls.\n";
 
 static struct ast_cli_entry cli_agents[] = {
-	NEW_CLI(agents_show, "Show status of agents"),
-	NEW_CLI(agents_show_online, "Show all online agents"),
-	NEW_CLI(agent_logoff_cmd, "Sets an agent offline"),
+	AST_CLI(agents_show, "Show status of agents"),
+	AST_CLI(agents_show_online, "Show all online agents"),
+	AST_CLI(agent_logoff_cmd, "Sets an agent offline"),
 };
 
 /*!
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index 6bc838e796..a257bffccb 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -1096,11 +1096,11 @@ static char *console_dial(struct ast_cli_entry *e, int cmd, struct ast_cli_args
 }
 
 static struct ast_cli_entry cli_alsa[] = {
-	NEW_CLI(console_answer, "Answer an incoming console call"),
-	NEW_CLI(console_hangup, "Hangup a call on the console"),
-	NEW_CLI(console_dial, "Dial an extension on the console"),
-	NEW_CLI(console_sendtext, "Send text to the remote device"),
-	NEW_CLI(console_autoanswer, "Sets/displays autoanswer"),
+	AST_CLI(console_answer, "Answer an incoming console call"),
+	AST_CLI(console_hangup, "Hangup a call on the console"),
+	AST_CLI(console_dial, "Dial an extension on the console"),
+	AST_CLI(console_sendtext, "Send text to the remote device"),
+	AST_CLI(console_autoanswer, "Sets/displays autoanswer"),
 };
 
 static int load_module(void)
diff --git a/channels/chan_features.c b/channels/chan_features.c
index 719de09ed9..8a563290bb 100644
--- a/channels/chan_features.c
+++ b/channels/chan_features.c
@@ -543,7 +543,7 @@ static char *features_show(struct ast_cli_entry *e, int cmd, struct ast_cli_args
 }
 
 static struct ast_cli_entry cli_features[] = {
-	NEW_CLI(features_show, "List status of feature channels"),
+	AST_CLI(features_show, "List status of feature channels"),
 };
 
 static int load_module(void)
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index 9536d06d89..ae5cdb74d4 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -235,8 +235,8 @@ static struct ast_rtp_protocol gtalk_rtp = {
 };
 
 static struct ast_cli_entry gtalk_cli[] = {
-	NEW_CLI(gtalk_do_reload, "Reload GoogleTalk configuration"),
-	NEW_CLI(gtalk_show_channels, "Show GoogleTalk channels"),
+	AST_CLI(gtalk_do_reload, "Reload GoogleTalk configuration"),
+	AST_CLI(gtalk_show_channels, "Show GoogleTalk channels"),
 };
 
 static char externip[16];
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 7e50afc12a..a0f7c961d7 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -2744,11 +2744,11 @@ static char *handle_cli_h323_show_tokens(struct ast_cli_entry *e, int cmd, struc
 }
 
 static struct ast_cli_entry cli_h323[] = {
-	NEW_CLI(handle_cli_h323_set_trace,   "Enable/Disable H.323 Stack Tracing"),
-	NEW_CLI(handle_cli_h323_set_debug,   "Enable/Disable H.323 Debugging"),
-	NEW_CLI(handle_cli_h323_cycle_gk,    "Manually re-register with the Gatekeper"),
-	NEW_CLI(handle_cli_h323_hangup,      "Manually try to hang up a call"),
-	NEW_CLI(handle_cli_h323_show_tokens, "Show all active call tokens"),
+	AST_CLI(handle_cli_h323_set_trace,   "Enable/Disable H.323 Stack Tracing"),
+	AST_CLI(handle_cli_h323_set_debug,   "Enable/Disable H.323 Debugging"),
+	AST_CLI(handle_cli_h323_cycle_gk,    "Manually re-register with the Gatekeper"),
+	AST_CLI(handle_cli_h323_hangup,      "Manually try to hang up a call"),
+	AST_CLI(handle_cli_h323_show_tokens, "Show all active call tokens"),
 };
 
 static int reload_config(int is_reload)
@@ -3078,7 +3078,7 @@ static int reload(void)
 }
 
 static struct ast_cli_entry cli_h323_reload =
-	NEW_CLI(handle_cli_h323_reload, "Reload H.323 configuration");
+	AST_CLI(handle_cli_h323_reload, "Reload H.323 configuration");
 
 static enum ast_rtp_get_result oh323_get_rtp_peer(struct ast_channel *chan, struct ast_rtp **rtp)
 {
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 30af97a9d8..d0b68f13b7 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -11305,32 +11305,32 @@ static struct ast_switch iax2_switch =
 */
 
 static struct ast_cli_entry cli_iax2[] = {
-	NEW_CLI(handle_cli_iax2_provision,           "Provision an IAX device"),
-	NEW_CLI(handle_cli_iax2_prune_realtime,      "Prune a cached realtime lookup"),
-	NEW_CLI(handle_cli_iax2_reload,              "Reload IAX configuration"),
-	NEW_CLI(handle_cli_iax2_set_mtu,             "Set the IAX systemwide trunking MTU"),
-	NEW_CLI(handle_cli_iax2_set_debug,           "Enable IAX debugging"),
-	NEW_CLI(handle_cli_iax2_set_debug_trunk,     "Enable IAX trunk debugging"),
-	NEW_CLI(handle_cli_iax2_set_debug_jb,        "Enable IAX jitterbuffer debugging"),
-	NEW_CLI(handle_cli_iax2_set_debug_off,       "Disable IAX debugging"),
-	NEW_CLI(handle_cli_iax2_set_debug_trunk_off, "Disable IAX trunk debugging"),
-	NEW_CLI(handle_cli_iax2_set_debug_jb_off,    "Disable IAX jitterbuffer debugging"),
-	NEW_CLI(handle_cli_iax2_show_cache,          "Display IAX cached dialplan"),
-	NEW_CLI(handle_cli_iax2_show_channels,       "List active IAX channels"),
-	NEW_CLI(handle_cli_iax2_show_firmware,       "List available IAX firmware"),
-	NEW_CLI(handle_cli_iax2_show_netstats,       "List active IAX channel netstats"),
-	NEW_CLI(handle_cli_iax2_show_peer,           "Show details on specific IAX peer"),
-	NEW_CLI(handle_cli_iax2_show_peers,          "List defined IAX peers"),
-	NEW_CLI(handle_cli_iax2_show_registry,       "Display IAX registration status"),
-	NEW_CLI(handle_cli_iax2_show_stats,          "Display IAX statistics"),
-	NEW_CLI(handle_cli_iax2_show_threads,        "Display IAX helper thread info"),
-	NEW_CLI(handle_cli_iax2_show_users,          "List defined IAX users"),
-	NEW_CLI(handle_cli_iax2_test_losspct,        "Set IAX2 incoming frame loss percentage"),
-	NEW_CLI(handle_cli_iax2_unregister,          "Unregister (force expiration) an IAX2 peer from the registry"),
+	AST_CLI(handle_cli_iax2_provision,           "Provision an IAX device"),
+	AST_CLI(handle_cli_iax2_prune_realtime,      "Prune a cached realtime lookup"),
+	AST_CLI(handle_cli_iax2_reload,              "Reload IAX configuration"),
+	AST_CLI(handle_cli_iax2_set_mtu,             "Set the IAX systemwide trunking MTU"),
+	AST_CLI(handle_cli_iax2_set_debug,           "Enable IAX debugging"),
+	AST_CLI(handle_cli_iax2_set_debug_trunk,     "Enable IAX trunk debugging"),
+	AST_CLI(handle_cli_iax2_set_debug_jb,        "Enable IAX jitterbuffer debugging"),
+	AST_CLI(handle_cli_iax2_set_debug_off,       "Disable IAX debugging"),
+	AST_CLI(handle_cli_iax2_set_debug_trunk_off, "Disable IAX trunk debugging"),
+	AST_CLI(handle_cli_iax2_set_debug_jb_off,    "Disable IAX jitterbuffer debugging"),
+	AST_CLI(handle_cli_iax2_show_cache,          "Display IAX cached dialplan"),
+	AST_CLI(handle_cli_iax2_show_channels,       "List active IAX channels"),
+	AST_CLI(handle_cli_iax2_show_firmware,       "List available IAX firmware"),
+	AST_CLI(handle_cli_iax2_show_netstats,       "List active IAX channel netstats"),
+	AST_CLI(handle_cli_iax2_show_peer,           "Show details on specific IAX peer"),
+	AST_CLI(handle_cli_iax2_show_peers,          "List defined IAX peers"),
+	AST_CLI(handle_cli_iax2_show_registry,       "Display IAX registration status"),
+	AST_CLI(handle_cli_iax2_show_stats,          "Display IAX statistics"),
+	AST_CLI(handle_cli_iax2_show_threads,        "Display IAX helper thread info"),
+	AST_CLI(handle_cli_iax2_show_users,          "List defined IAX users"),
+	AST_CLI(handle_cli_iax2_test_losspct,        "Set IAX2 incoming frame loss percentage"),
+	AST_CLI(handle_cli_iax2_unregister,          "Unregister (force expiration) an IAX2 peer from the registry"),
 #ifdef IAXTESTS
-	NEW_CLI(handle_cli_iax2_test_jitter,         "Simulates jitter for testing"),
-	NEW_CLI(handle_cli_iax2_test_late,           "Test the receipt of a late frame"),
-	NEW_CLI(handle_cli_iax2_test_resync,         "Test a resync in received timestamps"),
+	AST_CLI(handle_cli_iax2_test_jitter,         "Simulates jitter for testing"),
+	AST_CLI(handle_cli_iax2_test_late,           "Test the receipt of a late frame"),
+	AST_CLI(handle_cli_iax2_test_resync,         "Test a resync in received timestamps"),
 #endif /* IAXTESTS */
 };
 
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index fb843209af..2dc74eafd9 100644
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -236,8 +236,8 @@ static struct ast_rtp_protocol jingle_rtp = {
 };
 
 static struct ast_cli_entry jingle_cli[] = {
-	NEW_CLI(jingle_do_reload, "Reload Jingle configuration"),
-	NEW_CLI(jingle_show_channels, "Show Jingle channels"),
+	AST_CLI(jingle_do_reload, "Reload Jingle configuration"),
+	AST_CLI(jingle_show_channels, "Show Jingle channels"),
 };
 
 
diff --git a/channels/chan_local.c b/channels/chan_local.c
index b33aa136b0..bfe19f4cca 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -723,7 +723,7 @@ static char *locals_show(struct ast_cli_entry *e, int cmd, struct ast_cli_args *
 }
 
 static struct ast_cli_entry cli_local[] = {
-	NEW_CLI(locals_show, "List status of local channels"),
+	AST_CLI(locals_show, "List status of local channels"),
 };
 
 /*! \brief Load module into PBX, register channel */
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index a7679ccddf..fc8b54f55b 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -1183,11 +1183,11 @@ static char *handle_mgcp_set_debug_off(struct ast_cli_entry *e, int cmd, struct
 }
 
 static struct ast_cli_entry cli_mgcp[] = {
-	NEW_CLI(handle_mgcp_audit_endpoint, "Audit specified MGCP endpoint"),
-	NEW_CLI(handle_mgcp_show_endpoints, "List defined MGCP endpoints"),
-	NEW_CLI(handle_mgcp_set_debug, "Enable MGCP debugging"),
-	NEW_CLI(handle_mgcp_set_debug_off, "Disable MGCP debugging"),
-	NEW_CLI(mgcp_reload, "Reload MGCP configuration"),
+	AST_CLI(handle_mgcp_audit_endpoint, "Audit specified MGCP endpoint"),
+	AST_CLI(handle_mgcp_show_endpoints, "List defined MGCP endpoints"),
+	AST_CLI(handle_mgcp_set_debug, "Enable MGCP debugging"),
+	AST_CLI(handle_mgcp_set_debug_off, "Disable MGCP debugging"),
+	AST_CLI(mgcp_reload, "Reload MGCP configuration"),
 };
 
 static int mgcp_answer(struct ast_channel *ast)
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index f9119413f9..a717bafe56 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -1707,27 +1707,27 @@ static char *complete_show_config(struct ast_cli_args *a)
 }
 
 static struct ast_cli_entry chan_misdn_clis[] = {
-	NEW_CLI(handle_cli_misdn_port_block,        "Block the given port"),
-	NEW_CLI(handle_cli_misdn_port_down,         "Try to deacivate the L1 on the given port"),
-	NEW_CLI(handle_cli_misdn_port_unblock,      "Unblock the given port"),
-	NEW_CLI(handle_cli_misdn_port_up,           "Try to establish L1 on the given port"),
-	NEW_CLI(handle_cli_misdn_reload,            "Reload internal mISDN config, read from the config file"),
-	NEW_CLI(handle_cli_misdn_restart_pid,       "Restart the given pid"),
-	NEW_CLI(handle_cli_misdn_restart_port,      "Restart the given port"),
-	NEW_CLI(handle_cli_misdn_show_channel,      "Show an internal mISDN channel"),
-	NEW_CLI(handle_cli_misdn_show_channels,     "Show the internal mISDN channel list"),
-	NEW_CLI(handle_cli_misdn_show_config,       "Show internal mISDN config, read from the config file"),
-	NEW_CLI(handle_cli_misdn_show_port,         "Show detailed information for given port"),
-	NEW_CLI(handle_cli_misdn_show_ports_stats,  "Show mISDNs channel's call statistics per port"),
-	NEW_CLI(handle_cli_misdn_show_stacks,       "Show internal mISDN stack_list"),
-	NEW_CLI(handle_cli_misdn_send_calldeflect,  "Send CallDeflection to mISDN Channel"),
-	NEW_CLI(handle_cli_misdn_send_digit,        "Send DTMF digit to mISDN Channel"),
-	NEW_CLI(handle_cli_misdn_send_display,      "Send Text to mISDN Channel"),
-	NEW_CLI(handle_cli_misdn_send_restart,      "Send a restart for every bchannel on the given port"),
-	NEW_CLI(handle_cli_misdn_set_crypt_debug,   "Set CryptDebuglevel of chan_misdn, at the moment, level={1,2}"),
-	NEW_CLI(handle_cli_misdn_set_debug,         "Set Debuglevel of chan_misdn"),
-	NEW_CLI(handle_cli_misdn_set_tics,          "???"),
-	NEW_CLI(handle_cli_misdn_toggle_echocancel, "Toggle EchoCancel on mISDN Channel"),
+	AST_CLI(handle_cli_misdn_port_block,        "Block the given port"),
+	AST_CLI(handle_cli_misdn_port_down,         "Try to deacivate the L1 on the given port"),
+	AST_CLI(handle_cli_misdn_port_unblock,      "Unblock the given port"),
+	AST_CLI(handle_cli_misdn_port_up,           "Try to establish L1 on the given port"),
+	AST_CLI(handle_cli_misdn_reload,            "Reload internal mISDN config, read from the config file"),
+	AST_CLI(handle_cli_misdn_restart_pid,       "Restart the given pid"),
+	AST_CLI(handle_cli_misdn_restart_port,      "Restart the given port"),
+	AST_CLI(handle_cli_misdn_show_channel,      "Show an internal mISDN channel"),
+	AST_CLI(handle_cli_misdn_show_channels,     "Show the internal mISDN channel list"),
+	AST_CLI(handle_cli_misdn_show_config,       "Show internal mISDN config, read from the config file"),
+	AST_CLI(handle_cli_misdn_show_port,         "Show detailed information for given port"),
+	AST_CLI(handle_cli_misdn_show_ports_stats,  "Show mISDNs channel's call statistics per port"),
+	AST_CLI(handle_cli_misdn_show_stacks,       "Show internal mISDN stack_list"),
+	AST_CLI(handle_cli_misdn_send_calldeflect,  "Send CallDeflection to mISDN Channel"),
+	AST_CLI(handle_cli_misdn_send_digit,        "Send DTMF digit to mISDN Channel"),
+	AST_CLI(handle_cli_misdn_send_display,      "Send Text to mISDN Channel"),
+	AST_CLI(handle_cli_misdn_send_restart,      "Send a restart for every bchannel on the given port"),
+	AST_CLI(handle_cli_misdn_set_crypt_debug,   "Set CryptDebuglevel of chan_misdn, at the moment, level={1,2}"),
+	AST_CLI(handle_cli_misdn_set_debug,         "Set Debuglevel of chan_misdn"),
+	AST_CLI(handle_cli_misdn_set_tics,          "???"),
+	AST_CLI(handle_cli_misdn_toggle_echocancel, "Toggle EchoCancel on mISDN Channel"),
 };
 
 static int update_config(struct chan_list *ch, int orig) 
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index cea7984dcd..bd89b03aa4 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -1455,16 +1455,16 @@ static char *console_boost(struct ast_cli_entry *e, int cmd, struct ast_cli_args
 }
 
 static struct ast_cli_entry cli_oss[] = {
-	NEW_CLI(console_answer, "Answer an incoming console call"),
-	NEW_CLI(console_hangup, "Hangup a call on the console"),
-	NEW_CLI(console_flash, "Flash a call on the console"),
-	NEW_CLI(console_dial, "Dial an extension on the console"),
-	NEW_CLI(console_mute, "Disable/Enable mic input"),
-	NEW_CLI(console_transfer, "Transfer a call to a different extension"),	
-	NEW_CLI(console_sendtext, "Send text to the remote device"),
-	NEW_CLI(console_autoanswer, "Sets/displays autoanswer"),
-	NEW_CLI(console_boost, "Sets/displays mic boost in dB"),
-	NEW_CLI(console_active, "Sets/displays active console"),
+	AST_CLI(console_answer, "Answer an incoming console call"),
+	AST_CLI(console_hangup, "Hangup a call on the console"),
+	AST_CLI(console_flash, "Flash a call on the console"),
+	AST_CLI(console_dial, "Dial an extension on the console"),
+	AST_CLI(console_mute, "Disable/Enable mic input"),
+	AST_CLI(console_transfer, "Transfer a call to a different extension"),	
+	AST_CLI(console_sendtext, "Send text to the remote device"),
+	AST_CLI(console_autoanswer, "Sets/displays autoanswer"),
+	AST_CLI(console_boost, "Sets/displays mic boost in dB"),
+	AST_CLI(console_active, "Sets/displays active console"),
 };
 
 /*!
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 118282fbae..ad089d2a5d 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -18947,25 +18947,25 @@ static int reload(void)
 
 /*! \brief SIP Cli commands definition */
 static struct ast_cli_entry cli_sip[] = {
-	NEW_CLI(sip_show_channels, "List active SIP channels/subscriptions"),
-	NEW_CLI(sip_show_domains, "List our local SIP domains."),
-	NEW_CLI(sip_show_inuse, "List all inuse/limits"),
-	NEW_CLI(sip_show_objects, "List all SIP object allocations"),
-	NEW_CLI(sip_show_peers, "List defined SIP peers"),
-	NEW_CLI(sip_show_registry, "List SIP registration status"),
-	NEW_CLI(sip_unregister, "Unregister (force expiration) a SIP peer from the registery\n"),
-	NEW_CLI(sip_show_settings, "Show SIP global settings"),
-	NEW_CLI(sip_notify, "Send a notify packet to a SIP peer"),
-	NEW_CLI(sip_show_channel, "Show detailed SIP channel info"),
-	NEW_CLI(sip_show_history, "Show SIP dialog history"),
-	NEW_CLI(sip_show_peer, "Show details on specific SIP peer"),
-	NEW_CLI(sip_show_users, "List defined SIP users"),
-	NEW_CLI(sip_show_user, "Show details on specific SIP user"),
-	NEW_CLI(sip_prune_realtime, "Prune cached Realtime users/peers"),
-	NEW_CLI(sip_do_debug, "Enable/Disable SIP debugging"),
-	NEW_CLI(sip_do_history, "Enable SIP history"),
-	NEW_CLI(sip_no_history, "Disable SIP history"),
-	NEW_CLI(sip_reload, "Reload SIP configuration"),
+	AST_CLI(sip_show_channels, "List active SIP channels/subscriptions"),
+	AST_CLI(sip_show_domains, "List our local SIP domains."),
+	AST_CLI(sip_show_inuse, "List all inuse/limits"),
+	AST_CLI(sip_show_objects, "List all SIP object allocations"),
+	AST_CLI(sip_show_peers, "List defined SIP peers"),
+	AST_CLI(sip_show_registry, "List SIP registration status"),
+	AST_CLI(sip_unregister, "Unregister (force expiration) a SIP peer from the registery\n"),
+	AST_CLI(sip_show_settings, "Show SIP global settings"),
+	AST_CLI(sip_notify, "Send a notify packet to a SIP peer"),
+	AST_CLI(sip_show_channel, "Show detailed SIP channel info"),
+	AST_CLI(sip_show_history, "Show SIP dialog history"),
+	AST_CLI(sip_show_peer, "Show details on specific SIP peer"),
+	AST_CLI(sip_show_users, "List defined SIP users"),
+	AST_CLI(sip_show_user, "Show details on specific SIP user"),
+	AST_CLI(sip_prune_realtime, "Prune cached Realtime users/peers"),
+	AST_CLI(sip_do_debug, "Enable/Disable SIP debugging"),
+	AST_CLI(sip_do_history, "Enable SIP history"),
+	AST_CLI(sip_no_history, "Disable SIP history"),
+	AST_CLI(sip_reload, "Reload SIP configuration"),
 };
 
 /*! \brief PBX load module - initialization */
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 0e58689824..bbea129158 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -2731,14 +2731,14 @@ static char *handle_skinny_show_settings(struct ast_cli_entry *e, int cmd, struc
 }
 
 static struct ast_cli_entry cli_skinny[] = {
-	NEW_CLI(handle_skinny_show_devices, "List defined Skinny devices"),
-	NEW_CLI(handle_skinny_show_device, "List Skinny device information"),
-	NEW_CLI(handle_skinny_show_lines, "List defined Skinny lines per device"),	
-	NEW_CLI(handle_skinny_show_line, "List Skinny line information"),
-	NEW_CLI(handle_skinny_show_settings, "List global Skinny settings"),
-	NEW_CLI(handle_skinny_set_debug, "Enable Skinny debugging"),
-	NEW_CLI(handle_skinny_set_debug_off, "Disable Skinny debugging"),
-	NEW_CLI(handle_skinny_reset, "Reset Skinny device(s)"),
+	AST_CLI(handle_skinny_show_devices, "List defined Skinny devices"),
+	AST_CLI(handle_skinny_show_device, "List Skinny device information"),
+	AST_CLI(handle_skinny_show_lines, "List defined Skinny lines per device"),	
+	AST_CLI(handle_skinny_show_line, "List Skinny line information"),
+	AST_CLI(handle_skinny_show_settings, "List global Skinny settings"),
+	AST_CLI(handle_skinny_set_debug, "Enable Skinny debugging"),
+	AST_CLI(handle_skinny_set_debug_off, "Disable Skinny debugging"),
+	AST_CLI(handle_skinny_reset, "Reset Skinny device(s)"),
 };
 
 #if 0
diff --git a/channels/chan_usbradio.c b/channels/chan_usbradio.c
index cc15725014..cbd2fd28f5 100644
--- a/channels/chan_usbradio.c
+++ b/channels/chan_usbradio.c
@@ -1923,10 +1923,10 @@ static char *handle_cli_radio_set_debug(struct ast_cli_entry *e, int cmd, struct
 }
 
 static struct ast_cli_entry cli_usbradio[] = {
-	NEW_CLI(handle_cli_radio_key,       "Simulate Rx Signal Present"),
-	NEW_CLI(handle_cli_radio_unkey,     "Simulate Rx Signal Lusb"),
-	NEW_CLI(handle_cli_radio_tune,      "Radio Tune"),
-	NEW_CLI(handle_cli_radio_set_debug, "Enable/Disable Radio Debugging"),
+	AST_CLI(handle_cli_radio_key,       "Simulate Rx Signal Present"),
+	AST_CLI(handle_cli_radio_unkey,     "Simulate Rx Signal Lusb"),
+	AST_CLI(handle_cli_radio_tune,      "Radio Tune"),
+	AST_CLI(handle_cli_radio_set_debug, "Enable/Disable Radio Debugging"),
 };
 
 /*
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 20ae5a3762..b808521e77 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -10828,14 +10828,14 @@ static char *handle_pri_show_debug(struct ast_cli_entry *e, int cmd, struct ast_
 }
 
 static struct ast_cli_entry zap_pri_cli[] = {
-	NEW_CLI(handle_pri_debug, "Enables PRI debugging on a span"),
-	NEW_CLI(handle_pri_no_debug, "Disables PRI debugging on a span"),
-	NEW_CLI(handle_pri_really_debug, "Enables REALLY INTENSE PRI debugging"),
-	NEW_CLI(handle_pri_show_spans, "Displays PRI Information"),
-	NEW_CLI(handle_pri_show_span, "Displays PRI Information"),
-	NEW_CLI(handle_pri_show_debug, "Displays current PRI debug settings"),
-	NEW_CLI(handle_pri_set_debug_file, "Sends PRI debug output to the specified file"),
-	NEW_CLI(handle_pri_unset_debug_file, "Ends PRI debug output to file"),
+	AST_CLI(handle_pri_debug, "Enables PRI debugging on a span"),
+	AST_CLI(handle_pri_no_debug, "Disables PRI debugging on a span"),
+	AST_CLI(handle_pri_really_debug, "Enables REALLY INTENSE PRI debugging"),
+	AST_CLI(handle_pri_show_spans, "Displays PRI Information"),
+	AST_CLI(handle_pri_show_span, "Displays PRI Information"),
+	AST_CLI(handle_pri_show_debug, "Displays current PRI debug settings"),
+	AST_CLI(handle_pri_set_debug_file, "Sends PRI debug output to the specified file"),
+	AST_CLI(handle_pri_unset_debug_file, "Ends PRI debug output to file"),
 };
 
 #endif /* HAVE_PRI */
@@ -11352,13 +11352,13 @@ static char *zap_show_version(struct ast_cli_entry *e, int cmd, struct ast_cli_a
 }
 
 static struct ast_cli_entry zap_cli[] = {
-	NEW_CLI(handle_zap_show_cadences, "List cadences"),
-	NEW_CLI(zap_show_channels, "Show active zapata channels"),
-	NEW_CLI(zap_show_channel, "Show information on a channel"),
-	NEW_CLI(zap_destroy_channel, "Destroy a channel"),
-	NEW_CLI(zap_restart_cmd, "Fully restart zaptel channels"),
-	NEW_CLI(zap_show_status, "Show all Zaptel cards status"),
-	NEW_CLI(zap_show_version, "Show the Zaptel version in use"),
+	AST_CLI(handle_zap_show_cadences, "List cadences"),
+	AST_CLI(zap_show_channels, "Show active zapata channels"),
+	AST_CLI(zap_show_channel, "Show information on a channel"),
+	AST_CLI(zap_destroy_channel, "Destroy a channel"),
+	AST_CLI(zap_restart_cmd, "Fully restart zaptel channels"),
+	AST_CLI(zap_show_status, "Show all Zaptel cards status"),
+	AST_CLI(zap_show_version, "Show the Zaptel version in use"),
 };
 
 #define TRANSFER	0
@@ -11958,11 +11958,11 @@ static char *handle_ss7_show_linkset(struct ast_cli_entry *e, int cmd, struct as
 }
 
 static struct ast_cli_entry zap_ss7_cli[] = {
-	NEW_CLI(handle_ss7_debug, "Enables SS7 debugging on a linkset"), 
-	NEW_CLI(handle_ss7_no_debug, "Disables SS7 debugging on a linkset"), 
-	NEW_CLI(handle_ss7_block_cic, "Disables SS7 debugging on a linkset"),
-	NEW_CLI(handle_ss7_unblock_cic, "Disables SS7 debugging on a linkset"),
-	NEW_CLI(handle_ss7_show_linkset, "Shows the status of a linkset"),
+	AST_CLI(handle_ss7_debug, "Enables SS7 debugging on a linkset"), 
+	AST_CLI(handle_ss7_no_debug, "Disables SS7 debugging on a linkset"), 
+	AST_CLI(handle_ss7_block_cic, "Disables SS7 debugging on a linkset"),
+	AST_CLI(handle_ss7_unblock_cic, "Disables SS7 debugging on a linkset"),
+	AST_CLI(handle_ss7_show_linkset, "Shows the status of a linkset"),
 };
 #endif /* HAVE_SS7 */
 
diff --git a/channels/iax2-provision.c b/channels/iax2-provision.c
index 3fe789ec8d..702d8bc141 100644
--- a/channels/iax2-provision.c
+++ b/channels/iax2-provision.c
@@ -471,7 +471,7 @@ static char *iax_show_provisioning(struct ast_cli_entry *e, int cmd, struct ast_
 }
 
 static struct ast_cli_entry cli_iax2_provision[] = {
-	NEW_CLI(iax_show_provisioning, "Display iax provisioning"),
+	AST_CLI(iax_show_provisioning, "Display iax provisioning"),
 };
 
 static int iax_provision_init(void)
diff --git a/codecs/codec_zap.c b/codecs/codec_zap.c
index 1b8a2832df..afc2d324e7 100644
--- a/codecs/codec_zap.c
+++ b/codecs/codec_zap.c
@@ -70,7 +70,7 @@ static struct channel_usage {
 static char *handle_cli_transcoder_show(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
 
 static struct ast_cli_entry cli[] = {
-	NEW_CLI(handle_cli_transcoder_show, "Display Zaptel transcoder utilization.")
+	AST_CLI(handle_cli_transcoder_show, "Display Zaptel transcoder utilization.")
 };
 
 struct format_map {
diff --git a/funcs/func_devstate.c b/funcs/func_devstate.c
index 6ee68c7f6c..af1c10c43b 100644
--- a/funcs/func_devstate.c
+++ b/funcs/func_devstate.c
@@ -174,7 +174,7 @@ static char *cli_funcdevstate_list(struct ast_cli_entry *e, int cmd, struct ast_
 }
 
 static struct ast_cli_entry cli_funcdevstate[] = {
-	NEW_CLI(cli_funcdevstate_list, "List currently known custom device states"),
+	AST_CLI(cli_funcdevstate_list, "List currently known custom device states"),
 };
 
 static struct ast_custom_function devstate_function = {
diff --git a/include/asterisk/cli.h b/include/asterisk/cli.h
index f73d219d42..59d91ab8c9 100644
--- a/include/asterisk/cli.h
+++ b/include/asterisk/cli.h
@@ -84,7 +84,7 @@ void ast_cli(int fd, const char *fmt, ...)
 
 	...
 	// this is how we create the entry to register 
-	NEW_CLI(new_setdebug, "short description")
+	AST_CLI(new_setdebug, "short description")
 	...
 
    To help the transition, we make the pointer to the struct ast_cli_entry
@@ -197,7 +197,7 @@ struct ast_cli_entry {
 
 /* XXX the parser in gcc 2.95 gets confused if you don't put a space
  * between the last arg before VA_ARGS and the comma */
-#define NEW_CLI(fn, txt , ... )	{ .new_handler = fn, .summary = txt, ## __VA_ARGS__ }
+#define AST_CLI(fn, txt , ... )	{ .new_handler = fn, .summary = txt, ## __VA_ARGS__ }
 
 /*!
  * Helper function to generate cli entries from a NULL-terminated array.
diff --git a/main/asterisk.c b/main/asterisk.c
index f725c522b9..913859d569 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -1734,26 +1734,26 @@ static char *show_license(struct ast_cli_entry *e, int cmd, struct ast_cli_args
 #define ASTERISK_PROMPT2 "%s*CLI> "
 
 static struct ast_cli_entry cli_asterisk[] = {
-	NEW_CLI(handle_abort_shutdown, "Cancel a running shutdown"),
-	NEW_CLI(handle_stop_now, "Shut down Asterisk immediately"),
-	NEW_CLI(handle_stop_gracefully, "Gracefully shut down Asterisk"),
-	NEW_CLI(handle_stop_when_convenient, "Shut down Asterisk at empty call volume"),
-	NEW_CLI(handle_restart_now, "Restart Asterisk immediately"), 
-	NEW_CLI(handle_restart_gracefully, "Restart Asterisk gracefully"),
-	NEW_CLI(handle_restart_when_convenient, "Restart Asterisk at empty call volume"),
-	NEW_CLI(show_warranty, "Show the warranty (if any) for this copy of Asterisk"),
-	NEW_CLI(show_license, "Show the license(s) for this copy of Asterisk"),
-	NEW_CLI(handle_version, "Display version info"),
-	NEW_CLI(handle_bang, "Execute a shell command"),
+	AST_CLI(handle_abort_shutdown, "Cancel a running shutdown"),
+	AST_CLI(handle_stop_now, "Shut down Asterisk immediately"),
+	AST_CLI(handle_stop_gracefully, "Gracefully shut down Asterisk"),
+	AST_CLI(handle_stop_when_convenient, "Shut down Asterisk at empty call volume"),
+	AST_CLI(handle_restart_now, "Restart Asterisk immediately"), 
+	AST_CLI(handle_restart_gracefully, "Restart Asterisk gracefully"),
+	AST_CLI(handle_restart_when_convenient, "Restart Asterisk at empty call volume"),
+	AST_CLI(show_warranty, "Show the warranty (if any) for this copy of Asterisk"),
+	AST_CLI(show_license, "Show the license(s) for this copy of Asterisk"),
+	AST_CLI(handle_version, "Display version info"),
+	AST_CLI(handle_bang, "Execute a shell command"),
 #if !defined(LOW_MEMORY)
-	NEW_CLI(handle_show_version_files, "List versions of files used to build Asterisk"),
-	NEW_CLI(handle_show_threads, "Show running threads"),
+	AST_CLI(handle_show_version_files, "List versions of files used to build Asterisk"),
+	AST_CLI(handle_show_threads, "Show running threads"),
 #if defined(HAVE_SYSINFO)
-	NEW_CLI(handle_show_sysinfo, "Show System Information"),
+	AST_CLI(handle_show_sysinfo, "Show System Information"),
 #endif
-	NEW_CLI(handle_show_profile, "Display profiling info"),
-	NEW_CLI(handle_show_settings, "Show some core settings"),
-	NEW_CLI(handle_clear_profile, "Clear profiling info"),
+	AST_CLI(handle_show_profile, "Display profiling info"),
+	AST_CLI(handle_show_settings, "Show some core settings"),
+	AST_CLI(handle_clear_profile, "Clear profiling info"),
 #endif /* ! LOW_MEMORY */
 };
 
diff --git a/main/astmm.c b/main/astmm.c
index 1c6cc90c4a..2cf5325fb2 100644
--- a/main/astmm.c
+++ b/main/astmm.c
@@ -459,8 +459,8 @@ static char *handle_memory_show_summary(struct ast_cli_entry *e, int cmd, struct
 }
 
 static struct ast_cli_entry cli_memory[] = {
-	NEW_CLI(handle_memory_show, "Display outstanding memory allocations"),
-	NEW_CLI(handle_memory_show_summary, "Summarize outstanding memory allocations"),
+	AST_CLI(handle_memory_show, "Display outstanding memory allocations"),
+	AST_CLI(handle_memory_show_summary, "Summarize outstanding memory allocations"),
 };
 
 void __ast_mm_init(void)
diff --git a/main/astobj2.c b/main/astobj2.c
index 7e1bdb0217..8fbdf016c4 100644
--- a/main/astobj2.c
+++ b/main/astobj2.c
@@ -715,8 +715,8 @@ static char *handle_astobj2_test(struct ast_cli_entry *e, int cmd, struct ast_cl
 }
 
 static struct ast_cli_entry cli_astobj2[] = {
-	NEW_CLI(handle_astobj2_stats, "Print astobj2 statistics"),
-	NEW_CLI(handle_astobj2_test, "Test astobj2"),
+	AST_CLI(handle_astobj2_stats, "Print astobj2 statistics"),
+	AST_CLI(handle_astobj2_test, "Test astobj2"),
 };
 #endif /* AO2_DEBUG */
 
diff --git a/main/cdr.c b/main/cdr.c
index 3c28b1cbdc..a6cdaeaad4 100644
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -1291,8 +1291,8 @@ static char *handle_cli_submit(struct ast_cli_entry *e, int cmd, struct ast_cli_
 	return CLI_SUCCESS;
 }
 
-static struct ast_cli_entry cli_submit = NEW_CLI(handle_cli_submit, "Posts all pending batched CDR data");
-static struct ast_cli_entry cli_status = NEW_CLI(handle_cli_status, "Display the CDR status");
+static struct ast_cli_entry cli_submit = AST_CLI(handle_cli_submit, "Posts all pending batched CDR data");
+static struct ast_cli_entry cli_status = AST_CLI(handle_cli_status, "Display the CDR status");
 
 static int do_reload(int reload)
 {
diff --git a/main/channel.c b/main/channel.c
index 063fc81001..2edeebbf71 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -316,8 +316,8 @@ static char *handle_cli_core_show_channeltype(struct ast_cli_entry *e, int cmd,
 }
 
 static struct ast_cli_entry cli_channel[] = {
-	NEW_CLI(handle_cli_core_show_channeltypes, "List available channel types"),
-	NEW_CLI(handle_cli_core_show_channeltype,  "Give more details on that channel type")
+	AST_CLI(handle_cli_core_show_channeltypes, "List available channel types"),
+	AST_CLI(handle_cli_core_show_channeltype,  "Give more details on that channel type")
 };
 
 /*! \brief Checks to see if a channel is needing hang up */
diff --git a/main/cli.c b/main/cli.c
index 5888a8fc5c..432869c1a7 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -1108,47 +1108,47 @@ static char *group_show_channels(struct ast_cli_entry *e, int cmd, struct ast_cl
 #undef FORMAT_STRING
 }
 
-static struct ast_cli_entry cli_debug_channel_deprecated = NEW_CLI(handle_debugchan_deprecated, "Enable debugging on channel");
-static struct ast_cli_entry cli_module_load_deprecated = NEW_CLI(handle_load_deprecated, "Load a module");
-static struct ast_cli_entry cli_module_reload_deprecated = NEW_CLI(handle_reload_deprecated, "reload modules by name");
-static struct ast_cli_entry cli_module_unload_deprecated = NEW_CLI(handle_unload_deprecated, "unload modules by name");
+static struct ast_cli_entry cli_debug_channel_deprecated = AST_CLI(handle_debugchan_deprecated, "Enable debugging on channel");
+static struct ast_cli_entry cli_module_load_deprecated = AST_CLI(handle_load_deprecated, "Load a module");
+static struct ast_cli_entry cli_module_reload_deprecated = AST_CLI(handle_reload_deprecated, "reload modules by name");
+static struct ast_cli_entry cli_module_unload_deprecated = AST_CLI(handle_unload_deprecated, "unload modules by name");
 
 static char *handle_help(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
 
 static struct ast_cli_entry cli_cli[] = {
 	/* Deprecated, but preferred command is now consolidated (and already has a deprecated command for it). */
-	NEW_CLI(handle_commandcomplete, "Command complete"),
-	NEW_CLI(handle_commandnummatches, "Returns number of command matches"),
-	NEW_CLI(handle_commandmatchesarray, "Returns command matches array"),
+	AST_CLI(handle_commandcomplete, "Command complete"),
+	AST_CLI(handle_commandnummatches, "Returns number of command matches"),
+	AST_CLI(handle_commandmatchesarray, "Returns command matches array"),
 
-	NEW_CLI(handle_nodebugchan_deprecated, "Disable debugging on channel(s)"),
+	AST_CLI(handle_nodebugchan_deprecated, "Disable debugging on channel(s)"),
 
-	NEW_CLI(handle_chanlist, "Display information on channels"),
+	AST_CLI(handle_chanlist, "Display information on channels"),
 
-	NEW_CLI(handle_showchan, "Display information on a specific channel"),
+	AST_CLI(handle_showchan, "Display information on a specific channel"),
 
-	NEW_CLI(handle_core_set_debug_channel, "Enable/disable debugging on a channel",
+	AST_CLI(handle_core_set_debug_channel, "Enable/disable debugging on a channel",
 		.deprecate_cmd = &cli_debug_channel_deprecated),
 
-	NEW_CLI(handle_verbose, "Set level of debug/verbose chattiness"),
+	AST_CLI(handle_verbose, "Set level of debug/verbose chattiness"),
 
-	NEW_CLI(group_show_channels, "Display active channels with group(s)"),
+	AST_CLI(group_show_channels, "Display active channels with group(s)"),
 
-	NEW_CLI(handle_help, "Display help list, or specific help on a command"),
+	AST_CLI(handle_help, "Display help list, or specific help on a command"),
 
-	NEW_CLI(handle_logger_mute, "Toggle logging output to a console"),
+	AST_CLI(handle_logger_mute, "Toggle logging output to a console"),
 
-	NEW_CLI(handle_modlist, "List modules and info"),
+	AST_CLI(handle_modlist, "List modules and info"),
 
-	NEW_CLI(handle_load, "Load a module by name", .deprecate_cmd = &cli_module_load_deprecated),
+	AST_CLI(handle_load, "Load a module by name", .deprecate_cmd = &cli_module_load_deprecated),
 
-	NEW_CLI(handle_reload, "Reload configuration", .deprecate_cmd = &cli_module_reload_deprecated),
+	AST_CLI(handle_reload, "Reload configuration", .deprecate_cmd = &cli_module_reload_deprecated),
 
-	NEW_CLI(handle_unload, "Unload a module by name", .deprecate_cmd = &cli_module_unload_deprecated ),
+	AST_CLI(handle_unload, "Unload a module by name", .deprecate_cmd = &cli_module_unload_deprecated ),
 
-	NEW_CLI(handle_showuptime, "Show uptime information"),
+	AST_CLI(handle_showuptime, "Show uptime information"),
 
-	NEW_CLI(handle_softhangup, "Request a hangup on a given channel"),
+	AST_CLI(handle_softhangup, "Request a hangup on a given channel"),
 };
 
 /*!
diff --git a/main/config.c b/main/config.c
index d8fb6df85f..29f0f9d081 100644
--- a/main/config.c
+++ b/main/config.c
@@ -2178,7 +2178,7 @@ static char *handle_cli_core_show_config_mappings(struct ast_cli_entry *e, int c
 }
 
 static struct ast_cli_entry cli_config[] = {
-	NEW_CLI(handle_cli_core_show_config_mappings, "Display config mappings (file names to config engines)"),
+	AST_CLI(handle_cli_core_show_config_mappings, "Display config mappings (file names to config engines)"),
 };
 
 int register_config_cli() 
diff --git a/main/db.c b/main/db.c
index 58245c255b..ba322d2a49 100644
--- a/main/db.c
+++ b/main/db.c
@@ -549,12 +549,12 @@ void ast_db_freetree(struct ast_db_entry *dbe)
 }
 
 struct ast_cli_entry cli_database[] = {
-	NEW_CLI(handle_cli_database_show,    "Shows database contents"),
-	NEW_CLI(handle_cli_database_showkey, "Shows database contents"),
-	NEW_CLI(handle_cli_database_get,     "Gets database value"),
-	NEW_CLI(handle_cli_database_put,     "Adds/updates database value"),
-	NEW_CLI(handle_cli_database_del,     "Removes database key/value"),
-	NEW_CLI(handle_cli_database_deltree, "Removes database keytree/values")
+	AST_CLI(handle_cli_database_show,    "Shows database contents"),
+	AST_CLI(handle_cli_database_showkey, "Shows database contents"),
+	AST_CLI(handle_cli_database_get,     "Gets database value"),
+	AST_CLI(handle_cli_database_put,     "Adds/updates database value"),
+	AST_CLI(handle_cli_database_del,     "Removes database key/value"),
+	AST_CLI(handle_cli_database_deltree, "Removes database keytree/values")
 };
 
 static int manager_dbput(struct mansession *s, const struct message *m)
diff --git a/main/dnsmgr.c b/main/dnsmgr.c
index 2761a97b29..f6372e62be 100644
--- a/main/dnsmgr.c
+++ b/main/dnsmgr.c
@@ -338,9 +338,9 @@ static char *handle_cli_status(struct ast_cli_entry *e, int cmd, struct ast_cli_
 	return CLI_SUCCESS;
 }
 
-static struct ast_cli_entry cli_reload = NEW_CLI(handle_cli_reload, "Reloads the DNS manager configuration");
-static struct ast_cli_entry cli_refresh = NEW_CLI(handle_cli_refresh, "Performs an immediate refresh");
-static struct ast_cli_entry cli_status = NEW_CLI(handle_cli_status, "Display the DNS manager status");
+static struct ast_cli_entry cli_reload = AST_CLI(handle_cli_reload, "Reloads the DNS manager configuration");
+static struct ast_cli_entry cli_refresh = AST_CLI(handle_cli_refresh, "Performs an immediate refresh");
+static struct ast_cli_entry cli_status = AST_CLI(handle_cli_status, "Display the DNS manager status");
 
 int dnsmgr_init(void)
 {
diff --git a/main/file.c b/main/file.c
index 93763c8726..ed7541bf6f 100644
--- a/main/file.c
+++ b/main/file.c
@@ -1239,7 +1239,7 @@ static char *handle_cli_core_show_file_formats(struct ast_cli_entry *e, int cmd,
 }
 
 struct ast_cli_entry cli_file[] = {
-	NEW_CLI(handle_cli_core_show_file_formats, "Displays file formats")
+	AST_CLI(handle_cli_core_show_file_formats, "Displays file formats")
 };
 
 int ast_file_init(void)
diff --git a/main/frame.c b/main/frame.c
index a204352088..24170997c0 100644
--- a/main/frame.c
+++ b/main/frame.c
@@ -913,10 +913,10 @@ static char *show_frame_stats(struct ast_cli_entry *e, int cmd, struct ast_cli_a
 
 /* Builtin Asterisk CLI-commands for debugging */
 static struct ast_cli_entry my_clis[] = {
-	NEW_CLI(show_codecs, "Displays a list of codecs"),
-	NEW_CLI(show_codec_n, "Shows a specific codec"),
+	AST_CLI(show_codecs, "Displays a list of codecs"),
+	AST_CLI(show_codec_n, "Shows a specific codec"),
 #ifdef TRACE_FRAMES
-	NEW_CLI(show_frame_stats, "Shows frame statistics"),
+	AST_CLI(show_frame_stats, "Shows frame statistics"),
 #endif
 };
 
diff --git a/main/http.c b/main/http.c
index 9413fa9a4b..b2310f481d 100644
--- a/main/http.c
+++ b/main/http.c
@@ -1299,7 +1299,7 @@ int ast_http_reload(void)
 }
 
 static struct ast_cli_entry cli_http[] = {
-	NEW_CLI(handle_show_http, "Display HTTP server status"),
+	AST_CLI(handle_show_http, "Display HTTP server status"),
 };
 
 int ast_http_init(void)
diff --git a/main/image.c b/main/image.c
index 0530ec5a42..df6b194cb7 100644
--- a/main/image.c
+++ b/main/image.c
@@ -211,7 +211,7 @@ static char *handle_core_show_image_formats(struct ast_cli_entry *e, int cmd, st
 }
 
 struct ast_cli_entry cli_image[] = {
-	NEW_CLI(handle_core_show_image_formats, "Displays image formats")
+	AST_CLI(handle_core_show_image_formats, "Displays image formats")
 };
 
 int ast_image_init(void)
diff --git a/main/logger.c b/main/logger.c
index fae61d4540..618a855c97 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -708,9 +708,9 @@ struct verb {
 static AST_RWLIST_HEAD_STATIC(verbosers, verb);
 
 static struct ast_cli_entry cli_logger[] = {
-	NEW_CLI(handle_logger_show_channels, "List configured log channels"),
-	NEW_CLI(handle_logger_reload, "Reopens the log files"),
-	NEW_CLI(handle_logger_rotate, "Rotates and reopens the log files")
+	AST_CLI(handle_logger_show_channels, "List configured log channels"),
+	AST_CLI(handle_logger_reload, "Reopens the log files"),
+	AST_CLI(handle_logger_rotate, "Rotates and reopens the log files")
 };
 
 static int handle_SIGXFSZ(int sig) 
diff --git a/main/manager.c b/main/manager.c
index 800dbe43cf..4077d0606c 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -717,13 +717,13 @@ static char *handle_showmaneventq(struct ast_cli_entry *e, int cmd, struct ast_c
 }
 
 static struct ast_cli_entry cli_manager[] = {
-	NEW_CLI(handle_showmancmd, "Show a manager interface command"),
-	NEW_CLI(handle_showmancmds, "List manager interface commands"),
-	NEW_CLI(handle_showmanconn, "List connected manager interface users"),
-	NEW_CLI(handle_showmaneventq, "List manager interface queued events"),
-	NEW_CLI(handle_showmanagers, "List configured manager users"),
-	NEW_CLI(handle_showmanager, "Display information on a specific manager user"),
-	NEW_CLI(handle_mandebug, "Show, enable, disable debugging of the manager code"),
+	AST_CLI(handle_showmancmd, "Show a manager interface command"),
+	AST_CLI(handle_showmancmds, "List manager interface commands"),
+	AST_CLI(handle_showmanconn, "List connected manager interface users"),
+	AST_CLI(handle_showmaneventq, "List manager interface queued events"),
+	AST_CLI(handle_showmanagers, "List configured manager users"),
+	AST_CLI(handle_showmanager, "Display information on a specific manager user"),
+	AST_CLI(handle_mandebug, "Show, enable, disable debugging of the manager code"),
 };
 
 /*
diff --git a/main/pbx.c b/main/pbx.c
index 2782b57c61..1de2f09b09 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -3967,15 +3967,15 @@ static char *handle_set_global(struct ast_cli_entry *e, int cmd, struct ast_cli_
  * CLI entries for upper commands ...
  */
 static struct ast_cli_entry pbx_cli[] = {
-	NEW_CLI(handle_show_applications, "Shows registered dialplan applications"),
-	NEW_CLI(handle_show_functions, "Shows registered dialplan functions"),
-	NEW_CLI(handle_show_switches, "Show alternative switches"),
-	NEW_CLI(handle_show_hints, "Show dialplan hints"),
-	NEW_CLI(handle_show_globals, "Show global dialplan variables"),
-	NEW_CLI(handle_show_function, "Describe a specific dialplan function"),
-	NEW_CLI(handle_show_application, "Describe a specific dialplan application"),
-	NEW_CLI(handle_set_global, "Set global dialplan variable"),
-	NEW_CLI(handle_show_dialplan, "Show dialplan"),
+	AST_CLI(handle_show_applications, "Shows registered dialplan applications"),
+	AST_CLI(handle_show_functions, "Shows registered dialplan functions"),
+	AST_CLI(handle_show_switches, "Show alternative switches"),
+	AST_CLI(handle_show_hints, "Show dialplan hints"),
+	AST_CLI(handle_show_globals, "Show global dialplan variables"),
+	AST_CLI(handle_show_function, "Describe a specific dialplan function"),
+	AST_CLI(handle_show_application, "Describe a specific dialplan application"),
+	AST_CLI(handle_set_global, "Set global dialplan variable"),
+	AST_CLI(handle_show_dialplan, "Show dialplan"),
 };
 
 static void unreference_cached_app(struct ast_app *app)
diff --git a/main/rtp.c b/main/rtp.c
index 1ae68ef93a..ccb846d3d6 100644
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -3979,10 +3979,10 @@ static char *handle_cli_stun_debug(struct ast_cli_entry *e, int cmd, struct ast_
 }
 
 static struct ast_cli_entry cli_rtp[] = {
-	NEW_CLI(handle_cli_rtp_debug,  "Enable/Disable RTP debugging"),
-	NEW_CLI(handle_cli_rtcp_debug, "Enable/Disable RTCP debugging"),
-	NEW_CLI(handle_cli_rtcp_stats, "Enable/Disable RTCP stats"),
-	NEW_CLI(handle_cli_stun_debug, "Enable/Disable STUN debugging"),
+	AST_CLI(handle_cli_rtp_debug,  "Enable/Disable RTP debugging"),
+	AST_CLI(handle_cli_rtcp_debug, "Enable/Disable RTCP debugging"),
+	AST_CLI(handle_cli_rtcp_stats, "Enable/Disable RTCP stats"),
+	AST_CLI(handle_cli_stun_debug, "Enable/Disable STUN debugging"),
 };
 
 static int __ast_rtp_reload(int reload)
diff --git a/main/threadstorage.c b/main/threadstorage.c
index 6f483e519c..e5bfc484af 100644
--- a/main/threadstorage.c
+++ b/main/threadstorage.c
@@ -222,8 +222,8 @@ static char *handle_cli_threadstorage_show_summary(struct ast_cli_entry *e, int
 }
 
 static struct ast_cli_entry cli[] = {
-	NEW_CLI(handle_cli_threadstorage_show_allocations, "Display outstanding thread local storage allocations"),
-	NEW_CLI(handle_cli_threadstorage_show_summary,     "Summarize outstanding memory allocations")
+	AST_CLI(handle_cli_threadstorage_show_allocations, "Display outstanding thread local storage allocations"),
+	AST_CLI(handle_cli_threadstorage_show_summary,     "Summarize outstanding memory allocations")
 };
 
 void threadstorage_init(void)
diff --git a/main/translate.c b/main/translate.c
index 88811ddc8e..0da2c4be9f 100644
--- a/main/translate.c
+++ b/main/translate.c
@@ -575,7 +575,7 @@ static char *handle_cli_core_show_translation(struct ast_cli_entry *e, int cmd,
 }
 
 static struct ast_cli_entry cli_translate[] = {
-	NEW_CLI(handle_cli_core_show_translation, "Display translation matrix")
+	AST_CLI(handle_cli_core_show_translation, "Display translation matrix")
 };
 
 /*! \brief register codec translator */
diff --git a/main/udptl.c b/main/udptl.c
index a140cc4fe5..d906d0549d 100644
--- a/main/udptl.c
+++ b/main/udptl.c
@@ -1197,9 +1197,9 @@ static char *handle_cli_udptl_debug_off(struct ast_cli_entry *e, int cmd, struct
 }
 
 static struct ast_cli_entry cli_udptl[] = {
-	NEW_CLI(handle_cli_udptl_debug,     "Enable UDPTL debugging"),
-	NEW_CLI(handle_cli_udptl_debug_ip,  "Enable UDPTL debugging on IP"),
-	NEW_CLI(handle_cli_udptl_debug_off, "Disable UDPTL debugging")
+	AST_CLI(handle_cli_udptl_debug,     "Enable UDPTL debugging"),
+	AST_CLI(handle_cli_udptl_debug_ip,  "Enable UDPTL debugging on IP"),
+	AST_CLI(handle_cli_udptl_debug_off, "Disable UDPTL debugging")
 };
 
 static void __ast_udptl_reload(int reload)
diff --git a/main/utils.c b/main/utils.c
index 653c31312b..ed3c47b2d9 100644
--- a/main/utils.c
+++ b/main/utils.c
@@ -786,7 +786,7 @@ static char *handle_show_locks(struct ast_cli_entry *e, int cmd, struct ast_cli_
 }
 
 static struct ast_cli_entry utils_cli[] = {
-	NEW_CLI(handle_show_locks, "Show which locks are held by which thread"),
+	AST_CLI(handle_show_locks, "Show which locks are held by which thread"),
 };
 
 #endif /* DEBUG_THREADS */
diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c
index f5a54f0bf0..20a0138b4e 100644
--- a/pbx/pbx_ael.c
+++ b/pbx/pbx_ael.c
@@ -1002,8 +1002,8 @@ static char *handle_cli_ael_reload(struct ast_cli_entry *e, int cmd, struct ast_
 }
 
 static struct ast_cli_entry cli_ael[] = {
-	NEW_CLI(handle_cli_ael_reload,         "Reload AEL configuration"),
-	NEW_CLI(handle_cli_ael_debug_multiple, "Enable AEL debugging flags")
+	AST_CLI(handle_cli_ael_reload,         "Reload AEL configuration"),
+	AST_CLI(handle_cli_ael_debug_multiple, "Enable AEL debugging flags")
 };
 
 static int unload_module(void)
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 8596264ca2..80f64964f1 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -1336,17 +1336,17 @@ static char *handle_cli_dialplan_reload(struct ast_cli_entry *e, int cmd, struct
  * CLI entries for commands provided by this module
  */
 static struct ast_cli_entry cli_pbx_config[] = {
-	NEW_CLI(handle_cli_dialplan_add_extension,    "Add new extension into context"),
-	NEW_CLI(handle_cli_dialplan_remove_extension, "Remove a specified extension"),
-	NEW_CLI(handle_cli_dialplan_add_ignorepat,    "Add new ignore pattern"),
-	NEW_CLI(handle_cli_dialplan_remove_ignorepat, "Remove ignore pattern from context"),
-	NEW_CLI(handle_cli_dialplan_add_include,      "Include context in other context"),
-	NEW_CLI(handle_cli_dialplan_remove_include,   "Remove a specified include from context"),
-	NEW_CLI(handle_cli_dialplan_reload,           "Reload extensions and *only* extensions")
+	AST_CLI(handle_cli_dialplan_add_extension,    "Add new extension into context"),
+	AST_CLI(handle_cli_dialplan_remove_extension, "Remove a specified extension"),
+	AST_CLI(handle_cli_dialplan_add_ignorepat,    "Add new ignore pattern"),
+	AST_CLI(handle_cli_dialplan_remove_ignorepat, "Remove ignore pattern from context"),
+	AST_CLI(handle_cli_dialplan_add_include,      "Include context in other context"),
+	AST_CLI(handle_cli_dialplan_remove_include,   "Remove a specified include from context"),
+	AST_CLI(handle_cli_dialplan_reload,           "Reload extensions and *only* extensions")
 };
 
 static struct ast_cli_entry cli_dialplan_save =
-	NEW_CLI(handle_cli_dialplan_save, "Save dialplan");
+	AST_CLI(handle_cli_dialplan_save, "Save dialplan");
 
 /*!
  * Standard module functions ...
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index 5bace5d8df..a03b7d5110 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -2864,21 +2864,21 @@ static char *dundi_show_precache(struct ast_cli_entry *e, int cmd, struct ast_cl
 }
 
 static struct ast_cli_entry cli_dundi[] = {
-	NEW_CLI(dundi_do_debug, "Enable DUNDi debugging"),
-	NEW_CLI(dundi_no_debug, "Disable DUNDi debugging"),
-	NEW_CLI(dundi_do_store_history, "Enable DUNDi historic records"),
-	NEW_CLI(dundi_no_store_history, "Disable DUNDi historic records"),
-	NEW_CLI(dundi_flush, "Flush DUNDi cache"),
-	NEW_CLI(dundi_show_peers, "Show defined DUNDi peers"),
-	NEW_CLI(dundi_show_trans, "Show active DUNDi transactions"),
-	NEW_CLI(dundi_show_entityid, "Display Global Entity ID"),
-	NEW_CLI(dundi_show_mappings, "Show DUNDi mappings"),
-	NEW_CLI(dundi_show_precache, "Show DUNDi precache"),
-	NEW_CLI(dundi_show_requests, "Show DUNDi requests"),
-	NEW_CLI(dundi_show_peer, "Show info on a specific DUNDi peer"),
-	NEW_CLI(dundi_do_precache, "Precache a number in DUNDi"),
-	NEW_CLI(dundi_do_lookup, "Lookup a number in DUNDi"),
-	NEW_CLI(dundi_do_query, "Query a DUNDi EID"),
+	AST_CLI(dundi_do_debug, "Enable DUNDi debugging"),
+	AST_CLI(dundi_no_debug, "Disable DUNDi debugging"),
+	AST_CLI(dundi_do_store_history, "Enable DUNDi historic records"),
+	AST_CLI(dundi_no_store_history, "Disable DUNDi historic records"),
+	AST_CLI(dundi_flush, "Flush DUNDi cache"),
+	AST_CLI(dundi_show_peers, "Show defined DUNDi peers"),
+	AST_CLI(dundi_show_trans, "Show active DUNDi transactions"),
+	AST_CLI(dundi_show_entityid, "Display Global Entity ID"),
+	AST_CLI(dundi_show_mappings, "Show DUNDi mappings"),
+	AST_CLI(dundi_show_precache, "Show DUNDi precache"),
+	AST_CLI(dundi_show_requests, "Show DUNDi requests"),
+	AST_CLI(dundi_show_peer, "Show info on a specific DUNDi peer"),
+	AST_CLI(dundi_do_precache, "Precache a number in DUNDi"),
+	AST_CLI(dundi_do_lookup, "Lookup a number in DUNDi"),
+	AST_CLI(dundi_do_query, "Query a DUNDi EID"),
 };
 
 static struct dundi_transaction *create_transaction(struct dundi_peer *p)
diff --git a/res/res_agi.c b/res/res_agi.c
index aeaeb7dd0c..994c83e088 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -2217,9 +2217,9 @@ static int deadagi_exec(struct ast_channel *chan, void *data)
 }
 
 static struct ast_cli_entry cli_agi[] = {
-	NEW_CLI(handle_cli_agi_debug,    "Enable/Disable AGI debugging"),
-	NEW_CLI(handle_cli_agi_show,     "List AGI commands or specific help"),
-	NEW_CLI(handle_cli_agi_dumphtml, "Dumps a list of AGI commands in HTML format")
+	AST_CLI(handle_cli_agi_debug,    "Enable/Disable AGI debugging"),
+	AST_CLI(handle_cli_agi_show,     "List AGI commands or specific help"),
+	AST_CLI(handle_cli_agi_dumphtml, "Dumps a list of AGI commands in HTML format")
 };
 
 static int unload_module(void)
diff --git a/res/res_clioriginate.c b/res/res_clioriginate.c
index 7a9245aba5..2a4780ca94 100644
--- a/res/res_clioriginate.c
+++ b/res/res_clioriginate.c
@@ -176,7 +176,7 @@ static char *handle_orig(struct ast_cli_entry *e, int cmd, struct ast_cli_args *
 }
 
 static struct ast_cli_entry cli_cliorig[] = {
-	NEW_CLI(handle_orig, "Originate a call"),
+	AST_CLI(handle_orig, "Originate a call"),
 };
 
 /*! \brief Unload orginate module */
diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index 2148f741cd..a2396d310b 100644
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -67,7 +67,7 @@ static int pgsql_reconnect(const char *database);
 static char *handle_cli_realtime_pgsql_status(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
 
 static struct ast_cli_entry cli_realtime[] = {
-	NEW_CLI(handle_cli_realtime_pgsql_status, "Shows connection information for the PostgreSQL RealTime driver"),
+	AST_CLI(handle_cli_realtime_pgsql_status, "Shows connection information for the PostgreSQL RealTime driver"),
 };
 
 static struct ast_variable *realtime_pgsql(const char *database, const char *table, va_list ap)
diff --git a/res/res_config_sqlite.c b/res/res_config_sqlite.c
index 40545a5757..095b827f80 100644
--- a/res/res_config_sqlite.c
+++ b/res/res_config_sqlite.c
@@ -500,7 +500,7 @@ AST_MUTEX_DEFINE_STATIC(mutex);
  * command.
  */
 static struct ast_cli_entry cli_status[] = {
-	NEW_CLI(handle_cli_show_sqlite_status, "Show status information about the SQLite 2 driver"),
+	AST_CLI(handle_cli_show_sqlite_status, "Show status information about the SQLite 2 driver"),
 };
 
 /*
diff --git a/res/res_convert.c b/res/res_convert.c
index 2e514b111a..2c753741bf 100644
--- a/res/res_convert.c
+++ b/res/res_convert.c
@@ -147,7 +147,7 @@ fail_out:
 }
 
 static struct ast_cli_entry cli_convert[] = {
-	NEW_CLI(handle_cli_file_convert, "Convert audio file")
+	AST_CLI(handle_cli_file_convert, "Convert audio file")
 };
 
 static int unload_module(void)
diff --git a/res/res_crypto.c b/res/res_crypto.c
index b0b34bd7c7..5f33369afb 100644
--- a/res/res_crypto.c
+++ b/res/res_crypto.c
@@ -582,8 +582,8 @@ static char *handle_cli_keys_init(struct ast_cli_entry *e, int cmd, struct ast_c
 }
 
 static struct ast_cli_entry cli_crypto[] = {
-	NEW_CLI(handle_cli_keys_show, "Displays RSA key information"),
-	NEW_CLI(handle_cli_keys_init, "Initialize RSA key passcodes")
+	AST_CLI(handle_cli_keys_show, "Displays RSA key information"),
+	AST_CLI(handle_cli_keys_init, "Initialize RSA key passcodes")
 };
 
 /*! \brief initialise the res_crypto module */
diff --git a/res/res_features.c b/res/res_features.c
index 9bf0914e97..993d1b90f4 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -2629,11 +2629,11 @@ static char *handle_parkedcalls_deprecated(struct ast_cli_entry *e, int cmd, str
 	return res;
 }
 
-static struct ast_cli_entry cli_show_parkedcalls_deprecated = NEW_CLI(handle_parkedcalls_deprecated, "List currently parked calls.");
+static struct ast_cli_entry cli_show_parkedcalls_deprecated = AST_CLI(handle_parkedcalls_deprecated, "List currently parked calls.");
 
 static struct ast_cli_entry cli_features[] = {
-	NEW_CLI(handle_feature_show, "Lists configured features"),
-	NEW_CLI(handle_parkedcalls, "List currently parked calls", .deprecate_cmd = &cli_show_parkedcalls_deprecated),
+	AST_CLI(handle_feature_show, "Lists configured features"),
+	AST_CLI(handle_parkedcalls, "List currently parked calls", .deprecate_cmd = &cli_show_parkedcalls_deprecated),
 };
 
 /*! 
diff --git a/res/res_indications.c b/res/res_indications.c
index e573e4a908..475a79d310 100644
--- a/res/res_indications.c
+++ b/res/res_indications.c
@@ -382,9 +382,9 @@ out:			v = v->next;
 
 /*! \brief CLI entries for commands provided by this module */
 static struct ast_cli_entry cli_indications[] = {
-	NEW_CLI(handle_cli_indication_add,    "Add the given indication to the country"),
-	NEW_CLI(handle_cli_indication_remove, "Remove the given indication from the country"),
-	NEW_CLI(handle_cli_indication_show,   "Display a list of all countries/indications")
+	AST_CLI(handle_cli_indication_add,    "Add the given indication to the country"),
+	AST_CLI(handle_cli_indication_remove, "Remove the given indication from the country"),
+	AST_CLI(handle_cli_indication_show,   "Display a list of all countries/indications")
 };
 
 /*! \brief Unload indicators module */
diff --git a/res/res_jabber.c b/res/res_jabber.c
index f93c8617f4..94649874ab 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -115,12 +115,12 @@ static int aji_register_transport2(void *data, ikspak *pak);
 */
 
 static struct ast_cli_entry aji_cli[] = {
-	NEW_CLI(aji_do_debug, "Enable jabber debugging"),
-	NEW_CLI(aji_no_debug, "Disable Jabber debug"),
-	NEW_CLI(aji_do_reload, "Reload Jabber configuration"),
-	NEW_CLI(aji_show_clients, "Show state of clients and components"),
-	NEW_CLI(aji_show_buddies, "Show buddy lists of our clients"),
-	NEW_CLI(aji_test, "Shows roster, but is generally used for mog's debugging."),
+	AST_CLI(aji_do_debug, "Enable jabber debugging"),
+	AST_CLI(aji_no_debug, "Disable Jabber debug"),
+	AST_CLI(aji_do_reload, "Reload Jabber configuration"),
+	AST_CLI(aji_show_clients, "Show state of clients and components"),
+	AST_CLI(aji_show_buddies, "Show buddy lists of our clients"),
+	AST_CLI(aji_test, "Shows roster, but is generally used for mog's debugging."),
 };
 
 static char *app_ajisend = "JabberSend";
diff --git a/res/res_limit.c b/res/res_limit.c
index fcaf03b862..9d6d2699c7 100644
--- a/res/res_limit.c
+++ b/res/res_limit.c
@@ -204,7 +204,7 @@ static char *handle_cli_ulimit(struct ast_cli_entry *e, int cmd, struct ast_cli_
 }
 
 static struct ast_cli_entry cli_ulimit =
-	NEW_CLI(handle_cli_ulimit, "Set or show process resource limits");
+	AST_CLI(handle_cli_ulimit, "Set or show process resource limits");
 
 static int unload_module(void)
 {
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 49c0d31ac3..eec8306278 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -1273,9 +1273,9 @@ static char *handle_cli_moh_show_classes(struct ast_cli_entry *e, int cmd, struc
 }
 
 static struct ast_cli_entry cli_moh[] = {
-	NEW_CLI(handle_cli_moh_reload,       "Reload MusicOnHold"),
-	NEW_CLI(handle_cli_moh_show_classes, "List MusicOnHold classes"),
-	NEW_CLI(handle_cli_moh_show_files,   "List MusicOnHold file-based classes")
+	AST_CLI(handle_cli_moh_reload,       "Reload MusicOnHold"),
+	AST_CLI(handle_cli_moh_show_classes, "List MusicOnHold classes"),
+	AST_CLI(handle_cli_moh_show_files,   "List MusicOnHold file-based classes")
 };
 
 static int init_classes(int reload) 
diff --git a/res/res_odbc.c b/res/res_odbc.c
index 18627d4d2b..7d27bfd4fa 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -396,7 +396,7 @@ static char *handle_cli_odbc_show(struct ast_cli_entry *e, int cmd, struct ast_c
 }
 
 static struct ast_cli_entry cli_odbc[] = {
-	NEW_CLI(handle_cli_odbc_show, "List ODBC DSN(s)")
+	AST_CLI(handle_cli_odbc_show, "List ODBC DSN(s)")
 };
 
 static int odbc_register_class(struct odbc_class *class, int connect)
diff --git a/res/res_realtime.c b/res/res_realtime.c
index e560e02a32..7806c82f26 100644
--- a/res/res_realtime.c
+++ b/res/res_realtime.c
@@ -117,8 +117,8 @@ static char *cli_realtime_update(struct ast_cli_entry *e, int cmd, struct ast_cl
 }
 
 static struct ast_cli_entry cli_realtime[] = {
-	NEW_CLI(cli_realtime_load, "Used to print out RealTime variables."),
-	NEW_CLI(cli_realtime_update, "Used to update RealTime variables."),
+	AST_CLI(cli_realtime_load, "Used to print out RealTime variables."),
+	AST_CLI(cli_realtime_update, "Used to update RealTime variables."),
 };
 
 static int unload_module(void)