diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 05b7c997f..7ebdb0f07 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -1862,7 +1862,7 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
 
 	//Hurdler: 3d-floors test
 #ifdef R_FAKEFLOORS
-	if (gr_frontsector && gr_backsector && !Tags_Compare(&gr_frontsector->tags, &gr_backsector->tags) && (gr_backsector->ffloors || gr_frontsector->ffloors))
+	if (gr_frontsector && gr_backsector && !Tag_Compare(&gr_frontsector->tags, &gr_backsector->tags) && (gr_backsector->ffloors || gr_frontsector->ffloors))
 	{
 		ffloor_t * rover;
 		fixed_t    highcut = 0, lowcut = 0;
@@ -2662,7 +2662,7 @@ static void HWR_AddLine(seg_t * line)
 #endif
 			!line->sidedef->midtexture
 			&& ((!gr_frontsector->ffloors && !gr_backsector->ffloors)
-			|| Tags_Compare(&gr_frontsector->tags, &gr_backsector->tags)))
+			|| Tag_Compare(&gr_frontsector->tags, &gr_backsector->tags)))
 				return; // line is empty, don't even bother
 			// treat like wide open window instead
 			HWR_ProcessSeg(); // Doesn't need arguments because they're defined globally :D
@@ -2704,7 +2704,7 @@ static void HWR_AddLine(seg_t * line)
 #endif
 		!line->sidedef->midtexture
 		&& ((!gr_frontsector->ffloors && !gr_backsector->ffloors)
-		|| Tags_Compare(&gr_frontsector->tags, &gr_backsector->tags)))
+		|| Tag_Compare(&gr_frontsector->tags, &gr_backsector->tags)))
 			return; // line is empty, don't even bother
 
 		goto clippass; // treat like wide open window instead
diff --git a/src/r_bsp.c b/src/r_bsp.c
index e581e6687..e360e4376 100644
--- a/src/r_bsp.c
+++ b/src/r_bsp.c
@@ -377,7 +377,7 @@ boolean R_IsEmptyLine(seg_t *line, sector_t *front, sector_t *back)
 		// Consider colormaps
 		&& back->extra_colormap == front->extra_colormap
 		&& ((!front->ffloors && !back->ffloors)
-		|| Tags_Compare(&front->tags, &back->tags)));
+		|| Tag_Compare(&front->tags, &back->tags)));
 }
 
 //
@@ -489,7 +489,7 @@ static void R_AddLine(seg_t *line)
 #endif
 		!line->sidedef->midtexture
 		&& ((!frontsector->ffloors && !backsector->ffloors)
-		|| Tags_Compare(&frontsector->tags, &backsector->tags)))
+		|| Tag_Compare(&frontsector->tags, &backsector->tags)))
 			return; // line is empty, don't even bother
 
 		goto clippass; // treat like wide open window instead
diff --git a/src/r_segs.c b/src/r_segs.c
index 1d6a56467..4fc74ce9d 100644
--- a/src/r_segs.c
+++ b/src/r_segs.c
@@ -2015,7 +2015,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 		    || backsector->floorlightsec != frontsector->floorlightsec
 		    //SoM: 4/3/2000: Check for colormaps
 		    || frontsector->extra_colormap != backsector->extra_colormap
-		    || (frontsector->ffloors != backsector->ffloors && !Tags_Compare(&frontsector->tags, &backsector->tags))
+		    || (frontsector->ffloors != backsector->ffloors && !Tag_Compare(&frontsector->tags, &backsector->tags)))
 		{
 			markfloor = true;
 		}
@@ -2046,7 +2046,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 		    || backsector->ceilinglightsec != frontsector->ceilinglightsec
 		    //SoM: 4/3/2000: Check for colormaps
 		    || frontsector->extra_colormap != backsector->extra_colormap
-		    || (frontsector->ffloors != backsector->ffloors && !Tags_Compare(&frontsector->tags, &backsector->tags))
+		    || (frontsector->ffloors != backsector->ffloors && !Tag_Compare(&frontsector->tags, &backsector->tags)))
 		{
 				markceiling = true;
 		}
@@ -2136,7 +2136,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 		rw_bottomtexturemid += sidedef->rowoffset;
 
 		// allocate space for masked texture tables
-		if (frontsector && backsector && !Tags_Compare(&frontsector->tags, &backsector->tags) && (backsector->ffloors || frontsector->ffloors))
+		if (frontsector && backsector && !Tag_Compare(&frontsector->tags, &backsector->tags) && (backsector->ffloors || frontsector->ffloors))
 		{
 			ffloor_t *rover;
 			ffloor_t *r2;