diff --git a/include/asterisk/agi.h b/include/asterisk/agi.h
index 226041173f..5a0edc83f2 100644
--- a/include/asterisk/agi.h
+++ b/include/asterisk/agi.h
@@ -46,8 +46,8 @@ typedef struct agi_command {
 	struct agi_command *next;
 } agi_command;
 
-int agi_register(agi_command *cmd);
-void agi_unregister(agi_command *cmd);
+int ast_agi_register(agi_command *cmd);
+void ast_agi_unregister(agi_command *cmd);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }
diff --git a/res/res_agi.c b/res/res_agi.c
index 7794449aa4..736cea3944 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -1658,7 +1658,7 @@ static int help_workhorse(int fd, char *match[])
 	return 0;
 }
 
-int agi_register(agi_command *agi)
+int ast_agi_register(agi_command *agi)
 {
 	int x;
 	for (x=0; x<MAX_COMMANDS - 1; x++) {
@@ -1677,7 +1677,7 @@ int agi_register(agi_command *agi)
 	return -1;
 }
 
-void agi_unregister(agi_command *agi)
+void ast_agi_unregister(agi_command *agi)
 {
 	int x;
 	for (x=0; x<MAX_COMMANDS - 1; x++) {