diff --git a/src/p_saveg.c b/src/p_saveg.c
index d9158d99c..b887b8a73 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -886,7 +886,7 @@ static void P_NetUnArchiveWorld(void)
 			else
 			{
 #endif
-			exc = R_GetExistingColormapByValues(rgba, fadergba, fadestart, fadeend, fog);
+			exc = R_GetColormapFromListByValues(rgba, fadergba, fadestart, fadeend, fog);
 
 			if (!exc)
 			{
diff --git a/src/r_data.c b/src/r_data.c
index 0e4a67e2d..e679f27ba 100644
--- a/src/r_data.c
+++ b/src/r_data.c
@@ -1458,13 +1458,13 @@ boolean R_CheckDefaultColormapValues(extracolormap_t *extra_colormap, boolean ch
 }
 
 //
-// R_GetExistingColormapByValues()
+// R_GetColormapFromListByValues()
 // NOTE: Returns NULL if no match is found
 //
 #ifdef EXTRACOLORMAPLUMPS
-extracolormap_t *R_GetExistingColormapByValues(INT32 rgba, INT32 fadergba, UINT8 fadestart, UINT8 fadeend, boolean fog, lumpnum_t lump)
+extracolormap_t *R_GetColormapFromListByValues(INT32 rgba, INT32 fadergba, UINT8 fadestart, UINT8 fadeend, boolean fog, lumpnum_t lump)
 #else
-extracolormap_t *R_GetExistingColormapByValues(INT32 rgba, INT32 fadergba, UINT8 fadestart, UINT8 fadeend, boolean fog)
+extracolormap_t *R_GetColormapFromListByValues(INT32 rgba, INT32 fadergba, UINT8 fadestart, UINT8 fadeend, boolean fog)
 #endif
 {
 	extracolormap_t *exc;
@@ -1492,12 +1492,12 @@ extracolormap_t *R_GetExistingColormapByValues(INT32 rgba, INT32 fadergba, UINT8
 	return NULL;
 }
 
-extracolormap_t *R_GetExistingColormap(extracolormap_t *extra_colormap)
+extracolormap_t *R_GetColormapFromList(extracolormap_t *extra_colormap)
 {
 #ifdef EXTRACOLORMAPLUMPS
-	return R_GetExistingColormapByValues(extra_colormap->rgba, extra_colormap->fadergba, extra_colormap->fadestart, extra_colormap->fadeend, extra_colormap->fog, extra_colormap->lump);
+	return R_GetColormapFromListByValues(extra_colormap->rgba, extra_colormap->fadergba, extra_colormap->fadestart, extra_colormap->fadeend, extra_colormap->fog, extra_colormap->lump);
 else
-	return R_GetExistingColormapByValues(extra_colormap->rgba, extra_colormap->fadergba, extra_colormap->fadestart, extra_colormap->fadeend, extra_colormap->fog);
+	return R_GetColormapFromListByValues(extra_colormap->rgba, extra_colormap->fadergba, extra_colormap->fadestart, extra_colormap->fadeend, extra_colormap->fog);
 #endif
 }
 
@@ -1511,7 +1511,7 @@ extracolormap_t *R_ColormapForName(char *name)
 	if (lump == LUMPERROR)
 		I_Error("R_ColormapForName: Cannot find colormap lump %.8s\n", name);
 
-	exc = R_GetExistingColormapByValues(0, 0x19000000, 0, 31, 0, lump);
+	exc = R_GetColormapFromListByValues(0, 0x19000000, 0, 31, 0, lump);
 	if (exc)
 		return exc;
 
@@ -1809,9 +1809,9 @@ extracolormap_t *R_CreateColormap(char *p1, char *p2, char *p3)
 
 	// Look for existing colormaps
 #ifdef EXTRACOLORMAPLUMPS
-	exc = R_GetExistingColormapByValues(rgba, fadergba, fadestart, fadeend, fog, LUMPERROR);
+	exc = R_GetColormapFromListByValues(rgba, fadergba, fadestart, fadeend, fog, LUMPERROR);
 #else
-	exc = R_GetExistingColormapByValues(rgba, fadergba, fadestart, fadeend, fog);
+	exc = R_GetColormapFromListByValues(rgba, fadergba, fadestart, fadeend, fog);
 #endif
 	if (exc)
 		return exc;
diff --git a/src/r_data.h b/src/r_data.h
index a2db8ba5c..17d85fd8b 100644
--- a/src/r_data.h
+++ b/src/r_data.h
@@ -111,10 +111,11 @@ extracolormap_t *R_CopyColormap(extracolormap_t *extra_colormap, boolean lightta
 void R_AddColormapToList(extracolormap_t *extra_colormap);
 boolean R_CheckDefaultColormapValues(extracolormap_t *extra_colormap, boolean checkrgba, boolean checkfadergba, boolean checkparams);
 #ifdef EXTRACOLORMAPLUMPS
-extracolormap_t *R_GetExistingColormapByValues(INT32 rgba, INT32 fadergba, UINT8 fadestart, UINT8 fadeend, boolean fog, lumpnum_t lump);
+extracolormap_t *R_GetColormapFromListByValues(INT32 rgba, INT32 fadergba, UINT8 fadestart, UINT8 fadeend, boolean fog, lumpnum_t lump);
 #else
-extracolormap_t *R_GetExistingColormapByValues(INT32 rgba, INT32 fadergba, UINT8 fadestart, UINT8 fadeend, boolean fog);
+extracolormap_t *R_GetColormapFromListByValues(INT32 rgba, INT32 fadergba, UINT8 fadestart, UINT8 fadeend, boolean fog);
 #endif
+extracolormap_t *R_GetColormapFromList(extracolormap_t *extra_colormap);
 lighttable_t *R_CreateLightTable(extracolormap_t *extra_colormap);
 extracolormap_t *R_CreateColormap(char *p1, char *p2, char *p3);
 #ifdef EXTRACOLORMAPLUMPS