diff --git a/ChangeLog b/ChangeLog
index e304d0345756e695a695e935ee022e8bfb818582..13765fc74cebcb32fe7998278db0d6354a0cf6e2 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 
 2005-11-10  Russell Bryant <russell@digium.com>
 
+	* many files: Change all references to ast_separate_app_args to ast_app_separate_args
 	* many files in apps/: Clean up some application descriptions. Make sure all descriptions in changed files are wrapped at 80 characters.
 
 2005-11-09  Russell Bryant <russell@digium.com>
@@ -185,7 +186,7 @@
 	* include/asterisk/channel.h: add parent_channel field
 	* channel.c (__ast_request_and_dial): use parent_channel field to inherit variables into new channel
 
-	* apps/app_cut.c (cut_internal): use ast_separate_app_args() instead of open code (issue #5560)
+	* apps/app_cut.c (cut_internal): use ast_app_separate_args() instead of open code (issue #5560)
 
 	* apps/app_mixmonitor.c (launch_monitor_thread): ast_strlen_zero can handle NULL input (issue #5561)
 	(mixmonitor_exec): same
diff --git a/apps/app_skel.c b/apps/app_skel.c
index 974c03e3e526ca90209ee5005bf44291f1ff0cc3..f0731c4e3c0d7ed7aeb9becb4158a4c449186014 100755
--- a/apps/app_skel.c
+++ b/apps/app_skel.c
@@ -93,7 +93,7 @@ static int app_exec(struct ast_channel *chan, void *data)
 		return -1;
 	}
 	
-	if ((argc = ast_separate_app_args(args, '|', argv, sizeof(argv) / sizeof(argv[0])))) {
+	if ((argc = ast_app_separate_args(args, '|', argv, sizeof(argv) / sizeof(argv[0])))) {
 		dummy = argv[0];
 		options = argv[1];
 		ast_parseoptions(app_opts, &flags, opts, options);
diff --git a/doc/CODING-GUIDELINES b/doc/CODING-GUIDELINES
index bca2be766b626235ab2e0baaddfc1bc289cad191..3d296a75ce37e0bb1ac7747ae1d569b9663e8610 100755
--- a/doc/CODING-GUIDELINES
+++ b/doc/CODING-GUIDELINES
@@ -295,7 +295,7 @@ you intend to parse the incoming data string.
 
 
 - Separating arguments to dialplan applications and functions
-Use ast_separate_app_args() to separate the arguments to your application
+Use ast_app_separate_args() to separate the arguments to your application
 once you have made a local copy of the string.
 
 - Parsing strings with strsep
diff --git a/include/asterisk/app.h b/include/asterisk/app.h
index ef74f6543f08dc2b375c52cf9094cb60636f4b49..38b1fdb73ff87e6e87dd7116e2909789fe9fdf85 100755
--- a/include/asterisk/app.h
+++ b/include/asterisk/app.h
@@ -190,13 +190,13 @@ int ast_app_group_match_get_count(char *groupmatch, char *category);
   \param arglist The list of arguments, defined using AST_APP_ARG
 
   This macro defines a structure intended to be used in a call
-  to ast_separate_app_args(). The structure includes all the
+  to ast_app_separate_args(). The structure includes all the
   arguments specified, plus an argv array that overlays them and an
   argc argument counter. The arguments must be declared using AST_APP_ARG,
   and they will all be character pointers (strings).
 
   \note The structure is <b>not</b> initialized, as the call to
-  ast_separate_app_args() will perform that function before parsing
+  ast_app_separate_args() will perform that function before parsing
   the arguments.
  */
 #define AST_DECLARE_APP_ARGS(name, arglist) \