diff --git a/include/asm/macro.h b/include/asm/macro.h
index 491fed38..ffecd8c1 100644
--- a/include/asm/macro.h
+++ b/include/asm/macro.h
@@ -13,15 +13,15 @@
 
 #include "helpers.h"
 
-void sym_AddNewMacroArg(char const *s);
-void sym_SaveCurrentMacroArgs(char *save[]);
-void sym_RestoreCurrentMacroArgs(char *save[]);
-void sym_UseNewMacroArgs(void);
-char *sym_FindMacroArg(int32_t i);
-void sym_UseCurrentMacroArgs(void);
-void sym_SetMacroArgID(uint32_t nMacroCount);
-void sym_ShiftCurrentMacroArgs(void);
-uint32_t sym_NbMacroArgs(void);
+void macro_AddNewArg(char const *s);
+void macro_SaveCurrentArgs(char *save[]);
+void macro_RestoreCurrentArgs(char *save[]);
+void macro_UseNewArgs(void);
+char *macro_FindArg(int32_t i);
+void macro_UseCurrentArgs(void);
+void macro_SetArgID(uint32_t nMacroCount);
+void macro_ShiftCurrentArgs(void);
+uint32_t macro_NbArgs(void);
 
 void macro_Init(void);
 
diff --git a/src/asm/asmy.y b/src/asm/asmy.y
index babf0d81..262285ba 100644
--- a/src/asm/asmy.y
+++ b/src/asm/asmy.y
@@ -709,7 +709,7 @@ macroargs	: /* empty */
 		| macroarg ',' macroargs
 ;
 
-macroarg	: T_STRING	{ sym_AddNewMacroArg($1); }
+macroarg	: T_STRING	{ macro_AddNewArg($1); }
 ;
 
 pseudoop	: equ
@@ -792,11 +792,11 @@ fail		: T_POP_FAIL string	{ fatalerror("%s", $2); }
 warn		: T_POP_WARN string	{ warning(WARNING_USER, "%s", $2); }
 ;
 
-shift		: T_POP_SHIFT		{ sym_ShiftCurrentMacroArgs(); }
+shift		: T_POP_SHIFT		{ macro_ShiftCurrentArgs(); }
 		| T_POP_SHIFT uconst {
 			int32_t i = $2;
 			while (i--)
-				sym_ShiftCurrentMacroArgs();
+				macro_ShiftCurrentArgs();
 		}
 ;
 
diff --git a/src/asm/fstack.c b/src/asm/fstack.c
index c7ec91c8..d7273bad 100644
--- a/src/asm/fstack.c
+++ b/src/asm/fstack.c
@@ -85,14 +85,14 @@ static void pushcontext(void)
 	switch ((*ppFileStack)->nStatus = nCurrentStatus) {
 	case STAT_isMacroArg:
 	case STAT_isMacro:
-		sym_SaveCurrentMacroArgs((*ppFileStack)->tzMacroArgs);
+		macro_SaveCurrentArgs((*ppFileStack)->tzMacroArgs);
 		(*ppFileStack)->pMacro = pCurrentMacro;
 		break;
 	case STAT_isInclude:
 		(*ppFileStack)->pFile = pCurrentFile;
 		break;
 	case STAT_isREPTBlock:
-		sym_SaveCurrentMacroArgs((*ppFileStack)->tzMacroArgs);
+		macro_SaveCurrentArgs((*ppFileStack)->tzMacroArgs);
 		(*ppFileStack)->pREPTBlock = pCurrentREPTBlock;
 		(*ppFileStack)->nREPTBlockSize = nCurrentREPTBlockSize;
 		(*ppFileStack)->nREPTBlockCount = nCurrentREPTBlockCount;
@@ -122,9 +122,9 @@ static int32_t popcontext(void)
 				yy_scan_bytes(pCurrentREPTBlock,
 					      nCurrentREPTBlockSize);
 			yy_switch_to_buffer(CurrentFlexHandle);
-			sym_UseCurrentMacroArgs();
-			sym_SetMacroArgID(nMacroCount++);
-			sym_UseNewMacroArgs();
+			macro_UseCurrentArgs();
+			macro_SetArgID(nMacroCount++);
+			macro_UseNewArgs();
 
 			/* Increment REPT count in file path */
 			pREPTIterationWritePtr =
@@ -179,14 +179,14 @@ static int32_t popcontext(void)
 	switch (nCurrentStatus = pLastFile->nStatus) {
 	case STAT_isMacroArg:
 	case STAT_isMacro:
-		sym_RestoreCurrentMacroArgs(pLastFile->tzMacroArgs);
+		macro_RestoreCurrentArgs(pLastFile->tzMacroArgs);
 		pCurrentMacro = pLastFile->pMacro;
 		break;
 	case STAT_isInclude:
 		pCurrentFile = pLastFile->pFile;
 		break;
 	case STAT_isREPTBlock:
-		sym_RestoreCurrentMacroArgs(pLastFile->tzMacroArgs);
+		macro_RestoreCurrentArgs(pLastFile->tzMacroArgs);
 		pCurrentREPTBlock = pLastFile->pREPTBlock;
 		nCurrentREPTBlockSize = pLastFile->nREPTBlockSize;
 		nCurrentREPTBlockCount = pLastFile->nREPTBlockCount;
@@ -431,10 +431,10 @@ uint32_t fstk_RunMacro(char *s)
 		return 0;
 
 	pushcontext();
-	sym_SetMacroArgID(nMacroCount++);
+	macro_SetArgID(nMacroCount++);
 	/* Minus 1 because there is a newline at the beginning of the buffer */
 	nLineNo = sym->nFileLine - 1;
-	sym_UseNewMacroArgs();
+	macro_UseNewArgs();
 	nCurrentStatus = STAT_isMacro;
 	nPrintedChars = snprintf(tzCurrentFileName, _MAX_PATH + 1,
 				 "%s::%s", sym->tzFileName, s);
@@ -463,7 +463,7 @@ void fstk_RunMacroArg(int32_t s)
 	else
 		s -= '0';
 
-	sym = sym_FindMacroArg(s);
+	sym = macro_FindArg(s);
 
 	if (sym == NULL)
 		fatalerror("No such macroargument");
@@ -505,10 +505,10 @@ void fstk_RunRept(uint32_t count, int32_t nReptLineNo)
 		/* For error printing to make sense, fake nLineNo */
 		nCurrentREPTBodyLastLine = nLineNo;
 		nLineNo = nReptLineNo;
-		sym_UseCurrentMacroArgs();
+		macro_UseCurrentArgs();
 		pushcontext();
-		sym_SetMacroArgID(nMacroCount++);
-		sym_UseNewMacroArgs();
+		macro_SetArgID(nMacroCount++);
+		macro_UseNewArgs();
 		nCurrentREPTBlockCount = count;
 		nCurrentStatus = STAT_isREPTBlock;
 		nCurrentREPTBlockSize = ulNewMacroSize;
diff --git a/src/asm/globlex.c b/src/asm/globlex.c
index aed7c125..100b8df7 100644
--- a/src/asm/globlex.c
+++ b/src/asm/globlex.c
@@ -197,9 +197,9 @@ char *AppendMacroArg(char whichArg, char *dest, size_t *destIndex)
 	char *marg;
 
 	if (whichArg == '@')
-		marg = sym_FindMacroArg(-1);
+		marg = macro_FindArg(-1);
 	else if (whichArg >= '1' && whichArg <= '9')
-		marg = sym_FindMacroArg(whichArg - '0');
+		marg = macro_FindArg(whichArg - '0');
 	else
 		fatalerror("Invalid macro argument '\\%c' in symbol", whichArg);
 
@@ -306,7 +306,7 @@ uint32_t PutMacroArg(char *src, uint32_t size)
 
 	yyskipbytes(size);
 	if ((size == 2 && src[1] >= '1' && src[1] <= '9')) {
-		s = sym_FindMacroArg(src[1] - '0');
+		s = macro_FindArg(src[1] - '0');
 
 		if (s != NULL)
 			yyunputstr(s);
@@ -325,7 +325,7 @@ uint32_t PutUniqueArg(char *src, uint32_t size)
 
 	yyskipbytes(size);
 
-	s = sym_FindMacroArg(-1);
+	s = macro_FindArg(-1);
 
 	if (s != NULL)
 		yyunputstr(s);
diff --git a/src/asm/lexer.c b/src/asm/lexer.c
index b8cea10f..cc65cdd0 100644
--- a/src/asm/lexer.c
+++ b/src/asm/lexer.c
@@ -605,7 +605,7 @@ size_t CopyMacroArg(char *dest, size_t maxLength, char c)
 		return 0;
 	}
 
-	s = sym_FindMacroArg(argNum);
+	s = macro_FindArg(argNum);
 
 	if (s == NULL)
 		fatalerror("Macro argument not defined");
diff --git a/src/asm/macro.c b/src/asm/macro.c
index 88e7c14d..71be9e6e 100644
--- a/src/asm/macro.c
+++ b/src/asm/macro.c
@@ -11,7 +11,7 @@
 static char *currentmacroargs[MAXMACROARGS + 1];
 static char *newmacroargs[MAXMACROARGS + 1];
 
-void sym_AddNewMacroArg(char const *s)
+void macro_AddNewArg(char const *s)
 {
 	int32_t i = 0;
 
@@ -28,7 +28,7 @@ void sym_AddNewMacroArg(char const *s)
 	}
 }
 
-void sym_SaveCurrentMacroArgs(char *save[])
+void macro_SaveCurrentArgs(char *save[])
 {
 	int32_t i;
 
@@ -38,7 +38,7 @@ void sym_SaveCurrentMacroArgs(char *save[])
 	}
 }
 
-void sym_RestoreCurrentMacroArgs(char *save[])
+void macro_RestoreCurrentArgs(char *save[])
 {
 	int32_t i;
 
@@ -48,7 +48,7 @@ void sym_RestoreCurrentMacroArgs(char *save[])
 	}
 }
 
-void sym_UseNewMacroArgs(void)
+void macro_UseNewArgs(void)
 {
 	int32_t i;
 
@@ -59,7 +59,7 @@ void sym_UseNewMacroArgs(void)
 	}
 }
 
-char *sym_FindMacroArg(int32_t i)
+char *macro_FindArg(int32_t i)
 {
 	if (i == -1)
 		i = MAXMACROARGS + 1;
@@ -72,15 +72,15 @@ char *sym_FindMacroArg(int32_t i)
 	return currentmacroargs[i - 1];
 }
 
-void sym_UseCurrentMacroArgs(void)
+void macro_UseCurrentArgs(void)
 {
 	int32_t i;
 
 	for (i = 1; i <= MAXMACROARGS; i++)
-		sym_AddNewMacroArg(sym_FindMacroArg(i));
+		macro_AddNewArg(macro_FindArg(i));
 }
 
-void sym_SetMacroArgID(uint32_t nMacroCount)
+void macro_SetArgID(uint32_t nMacroCount)
 {
 	char s[256];
 
@@ -88,7 +88,7 @@ void sym_SetMacroArgID(uint32_t nMacroCount)
 	newmacroargs[MAXMACROARGS] = strdup(s);
 }
 
-void sym_ShiftCurrentMacroArgs(void)
+void macro_ShiftCurrentArgs(void)
 {
 	int32_t i;
 
@@ -99,7 +99,7 @@ void sym_ShiftCurrentMacroArgs(void)
 	currentmacroargs[MAXMACROARGS - 1] = NULL;
 }
 
-uint32_t sym_NbMacroArgs(void)
+uint32_t macro_NbArgs(void)
 {
 	uint32_t i = 0;
 
diff --git a/src/asm/symbol.c b/src/asm/symbol.c
index dd4c73c1..166c7d78 100644
--- a/src/asm/symbol.c
+++ b/src/asm/symbol.c
@@ -51,7 +51,7 @@ static bool exportall;
 static int32_t Callback_NARG(struct sSymbol const *self)
 {
 	(void)self;
-	return sym_NbMacroArgs();
+	return macro_NbArgs();
 }
 
 static int32_t Callback__LINE__(struct sSymbol const *self)