diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c
index c598bee750d3760c32d811f5c50404fa89c06213..739fe241bb30fd6bde1a5b4fd6388abbddebfadb 100644
--- a/apps/app_dumpchan.c
+++ b/apps/app_dumpchan.c
@@ -149,7 +149,7 @@ static int serialize_showchan(struct ast_channel *c, char *buf, size_t size)
 
 static int dumpchan_exec(struct ast_channel *chan, void *data)
 {
-	struct ast_str *vars = ast_str_thread_get(&global_app_buf, 16);
+	struct ast_str *vars = ast_str_thread_get(&ast_str_thread_global_buf, 16);
 	char info[1024];
 	int level = 0;
 	static char *line = "================================================================================";
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 4da2eac728cff0ec5ca5cb0c99c8707fb8946b78..260745d65f40e1b2cca99038df0837cb72c7688b 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2319,7 +2319,7 @@ static void do_hang(struct callattempt *o)
 /*! \brief convert "\n" to "\nVariable: " ready for manager to use */
 static char *vars2manager(struct ast_channel *chan, char *vars, size_t len)
 {
-	struct ast_str *buf = ast_str_thread_get(&global_app_buf, len + 1);
+	struct ast_str *buf = ast_str_thread_get(&ast_str_thread_global_buf, len + 1);
 	char *tmp;
 
 	if (pbx_builtin_serialize_variables(chan, &buf)) {
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index b2ec1e0811a09c5a14d434d7b1f7a5437ebcefa2..7d3b6e6b7b2a300b8bccaa1a6e4a10bbf8772402 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -10267,7 +10267,7 @@ static const char *substitute_escapes(const char *value)
 	char *current;
 
 	/* Add 16 for fudge factor */
-	struct ast_str *str = ast_str_thread_get(&global_app_buf, strlen(value) + 16);
+	struct ast_str *str = ast_str_thread_get(&ast_str_thread_global_buf, strlen(value) + 16);
 
 	ast_str_reset(str);
 	
diff --git a/include/asterisk/app.h b/include/asterisk/app.h
index 01da2838194e0dd21c3cf5ee627ed903deeccd80..8e0d86952aafe7247480ad389758d3e04a457602 100644
--- a/include/asterisk/app.h
+++ b/include/asterisk/app.h
@@ -32,7 +32,7 @@ struct ast_flags64;
 extern "C" {
 #endif
 
-AST_THREADSTORAGE_EXTERNAL(global_app_buf);
+AST_THREADSTORAGE_EXTERNAL(ast_str_thread_global_buf);
 
 /* IVR stuff */
 
diff --git a/main/app.c b/main/app.c
index 5acde1baaecc119de6c670da12c7c85111b7d3b4..7b79915ea0efb5b0d9718bdb74b24d356d112b2a 100644
--- a/main/app.c
+++ b/main/app.c
@@ -52,7 +52,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/linkedlists.h"
 #include "asterisk/threadstorage.h"
 
-AST_THREADSTORAGE_PUBLIC(global_app_buf);
+AST_THREADSTORAGE_PUBLIC(ast_str_thread_global_buf);
 
 
 #define MAX_OTHER_FORMATS 10
diff --git a/main/cli.c b/main/cli.c
index 0bf8151e6cf0d6409655333cef2e946f19fd6dc3..d6ee56adfec0b2e5275750d4805e1e5ccbfaf2f2 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -1259,7 +1259,7 @@ static char *handle_showchan(struct ast_cli_entry *e, int cmd, struct ast_cli_ar
 {
 	struct ast_channel *c=NULL;
 	struct timeval now;
-	struct ast_str *out = ast_str_thread_get(&global_app_buf, 16);
+	struct ast_str *out = ast_str_thread_get(&ast_str_thread_global_buf, 16);
 	char cdrtime[256];
 	char nf[256], wf[256], rf[256];
 	long elapsed_seconds=0;