diff --git a/tagmanager/nestlevel.c b/tagmanager/nestlevel.c
index 62325573..c4da2703 100644
--- a/tagmanager/nestlevel.c
+++ b/tagmanager/nestlevel.c
@@ -22,13 +22,13 @@
 *   FUNCTION DEFINITIONS
 */
 
-extern NestingLevels *newNestingLevels(void)
+extern NestingLevels *nestingLevelsNew(void)
 {
 	NestingLevels *nls = xCalloc (1, NestingLevels);
 	return nls;
 }
 
-extern void freeNestingLevels(NestingLevels *nls)
+extern void nestingLevelsFree(NestingLevels *nls)
 {
 	int i;
 	for (i = 0; i < nls->allocated; i++)
diff --git a/tagmanager/nestlevel.h b/tagmanager/nestlevel.h
index 90b75fee..210772d4 100644
--- a/tagmanager/nestlevel.h
+++ b/tagmanager/nestlevel.h
@@ -42,8 +42,8 @@ struct NestingLevels
 /*
 *   FUNCTION PROTOTYPES
 */
-extern NestingLevels *newNestingLevels(void);
-extern void freeNestingLevels(NestingLevels *nls);
+extern NestingLevels *nestingLevelsNew(void);
+extern void nestingLevelsFree(NestingLevels *nls);
 extern void nestingLevelsPush(NestingLevels *nls,
 	const vString *name, int type);
 extern void nestingLevelsPop(NestingLevels *nls);
diff --git a/tagmanager/python.c b/tagmanager/python.c
index 91bcb460..c4c77827 100644
--- a/tagmanager/python.c
+++ b/tagmanager/python.c
@@ -432,7 +432,7 @@ static void findPythonTags (void)
 	vString *const name = vStringNew ();
 	vString *const parent = vStringNew();
 
-	NestingLevels *const nesting_levels = newNestingLevels();
+	NestingLevels *const nesting_levels = nestingLevelsNew();
 
 	const char *line;
 	int line_skip = 0;
@@ -549,7 +549,7 @@ static void findPythonTags (void)
 	vStringDelete (parent);
 	vStringDelete (name);
 	vStringDelete (continuation);
-	freeNestingLevels (nesting_levels);
+	nestingLevelsFree (nesting_levels);
 }
 
 extern parserDefinition *PythonParser (void)
diff --git a/tagmanager/rest.c b/tagmanager/rest.c
index 21455584..f044ab4c 100644
--- a/tagmanager/rest.c
+++ b/tagmanager/rest.c
@@ -130,7 +130,7 @@ static void findRestTags (void)
 	const unsigned char *line;
 
 	memset(kindchars, 0, sizeof kindchars);
-	nestingLevels = newNestingLevels();
+	nestingLevels = nestingLevelsNew();
 
 	while ((line = fileReadLine ()) != NULL)
 	{
@@ -156,7 +156,7 @@ static void findRestTags (void)
 		vStringTerminate(name);
 	}
 	vStringDelete (name);
-	freeNestingLevels(nestingLevels);
+	nestingLevelsFree(nestingLevels);
 }
 
 extern parserDefinition* RestParser (void)