diff --git a/src/am_map.cpp b/src/am_map.cpp
index dcfb361bfc..bd5bbe8fef 100644
--- a/src/am_map.cpp
+++ b/src/am_map.cpp
@@ -1930,16 +1930,16 @@ void AM_drawSubsectors()
 		// For lighting and texture determination
 		sector_t *sec = Renderer->FakeFlat(subsectors[i].render_sector, &tempsec, &floorlight, &ceilinglight, false);
 		// Find texture origin.
-		originpt.x = -sec->GetXOffsetF(sector_t::floor);
-		originpt.y = sec->GetYOffsetF(sector_t::floor);
-		rotation = -sec->GetAngleF(sector_t::floor);
+		originpt.x = -sec->GetXOffset(sector_t::floor);
+		originpt.y = sec->GetYOffset(sector_t::floor);
+		rotation = -sec->GetAngle(sector_t::floor);
 		// Coloring for the polygon
 		colormap = sec->ColorMap;
 
 		FTextureID maptex = sec->GetTexture(sector_t::floor);
 
-		scalex = sec->GetXScaleF(sector_t::floor);
-		scaley = sec->GetYScaleF(sector_t::floor);
+		scalex = sec->GetXScale(sector_t::floor);
+		scaley = sec->GetYScale(sector_t::floor);
 
 		if (sec->e->XFloor.ffloors.Size())
 		{
@@ -1988,11 +1988,11 @@ void AM_drawSubsectors()
 					floorplane = rover->top.plane;
 					sector_t *model = rover->top.model;
 					int selector = (rover->flags & FF_INVERTPLANES) ? sector_t::floor : sector_t::ceiling;
-					rotation = -model->GetAngleF(selector);
-					scalex = model->GetXScaleF(selector);
-					scaley = model->GetYScaleF(selector);
-					originpt.x = -model->GetXOffsetF(selector);
-					originpt.y = model->GetYOffsetF(selector);
+					rotation = -model->GetAngle(selector);
+					scalex = model->GetXScale(selector);
+					scaley = model->GetYScale(selector);
+					originpt.x = -model->GetXOffset(selector);
+					originpt.y = model->GetYOffset(selector);
 					break;
 				}
 			}
diff --git a/src/p_buildmap.cpp b/src/p_buildmap.cpp
index f7adf2cdd8..428e5e3679 100644
--- a/src/p_buildmap.cpp
+++ b/src/p_buildmap.cpp
@@ -447,29 +447,29 @@ static void LoadSectors (sectortype *bsec)
 		if (bsec->floorstat & 4)
 		{
 			sec->SetAngle(sector_t::floor, DAngle(90.));
-			sec->SetXScale(sector_t::floor, -sec->GetXScaleF(sector_t::floor));
+			sec->SetXScale(sector_t::floor, -sec->GetXScale(sector_t::floor));
 		}
 		if (bsec->floorstat & 16)
 		{
-			sec->SetXScale(sector_t::floor, -sec->GetXScaleF(sector_t::floor));
+			sec->SetXScale(sector_t::floor, -sec->GetXScale(sector_t::floor));
 		}
 		if (bsec->floorstat & 32)
 		{
-			sec->SetYScale(sector_t::floor, -sec->GetYScaleF(sector_t::floor));
+			sec->SetYScale(sector_t::floor, -sec->GetYScale(sector_t::floor));
 		}
 
 		if (bsec->ceilingstat & 4)
 		{
 			sec->SetAngle(sector_t::ceiling, DAngle(90.));
-			sec->SetYScale(sector_t::ceiling, -sec->GetYScaleF(sector_t::ceiling));
+			sec->SetYScale(sector_t::ceiling, -sec->GetYScale(sector_t::ceiling));
 		}
 		if (bsec->ceilingstat & 16)
 		{
-			sec->SetXScale(sector_t::ceiling, -sec->GetXScaleF(sector_t::ceiling));
+			sec->SetXScale(sector_t::ceiling, -sec->GetXScale(sector_t::ceiling));
 		}
 		if (bsec->ceilingstat & 32)
 		{
-			sec->SetYScale(sector_t::ceiling, -sec->GetYScaleF(sector_t::ceiling));
+			sec->SetYScale(sector_t::ceiling, -sec->GetYScale(sector_t::ceiling));
 		}
 	}
 }
diff --git a/src/p_scroll.cpp b/src/p_scroll.cpp
index 01fbba3c5f..b7ed4fc659 100644
--- a/src/p_scroll.cpp
+++ b/src/p_scroll.cpp
@@ -139,7 +139,7 @@ void DScroller::Serialize (FArchive &arc)
 
 static void RotationComp(const sector_t *sec, int which, double dx, double dy, double &tdx, double &tdy)
 {
-	DAngle an = sec->GetAngleF(which);
+	DAngle an = sec->GetAngle(which);
 	if (an == 0)
 	{
 		tdx = dx;
diff --git a/src/r_data/r_interpolate.cpp b/src/r_data/r_interpolate.cpp
index c6764eb703..3f97c413ba 100644
--- a/src/r_data/r_interpolate.cpp
+++ b/src/r_data/r_interpolate.cpp
@@ -604,8 +604,8 @@ void DSectorScrollInterpolation::Destroy()
 
 void DSectorScrollInterpolation::UpdateInterpolation()
 {
-	oldx = sector->GetXOffsetF(ceiling);
-	oldy = sector->GetYOffsetF(ceiling, false);
+	oldx = sector->GetXOffset(ceiling);
+	oldy = sector->GetYOffset(ceiling, false);
 }
 
 //==========================================================================
@@ -628,8 +628,8 @@ void DSectorScrollInterpolation::Restore()
 
 void DSectorScrollInterpolation::Interpolate(double smoothratio)
 {
-	bakx = sector->GetXOffsetF(ceiling);
-	baky = sector->GetYOffsetF(ceiling, false);
+	bakx = sector->GetXOffset(ceiling);
+	baky = sector->GetYOffset(ceiling, false);
 
 	if (refcount == 0 && oldx == bakx && oldy == baky)
 	{
diff --git a/src/r_defs.h b/src/r_defs.h
index 7bdf9aa715..6a811f9116 100644
--- a/src/r_defs.h
+++ b/src/r_defs.h
@@ -675,7 +675,7 @@ public:
 		planes[pos].xform.xOffs += o;
 	}
 
-	double GetXOffsetF(int pos) const
+	double GetXOffset(int pos) const
 	{
 		return planes[pos].xform.xOffs;
 	}
@@ -690,7 +690,7 @@ public:
 		planes[pos].xform.yOffs += o;
 	}
 
-	double GetYOffsetF(int pos, bool addbase = true) const
+	double GetYOffset(int pos, bool addbase = true) const
 	{
 		if (!addbase)
 		{
@@ -707,7 +707,7 @@ public:
 		planes[pos].xform.xScale = o;
 	}
 
-	double GetXScaleF(int pos) const
+	double GetXScale(int pos) const
 	{
 		return planes[pos].xform.xScale;
 	}
@@ -717,7 +717,7 @@ public:
 		planes[pos].xform.yScale = o;
 	}
 
-	double GetYScaleF(int pos) const
+	double GetYScale(int pos) const
 	{
 		return planes[pos].xform.yScale;
 	}
@@ -727,7 +727,7 @@ public:
 		planes[pos].xform.Angle = o;
 	}
 
-	DAngle GetAngleF(int pos, bool addbase = true) const
+	DAngle GetAngle(int pos, bool addbase = true) const
 	{
 		if (!addbase)
 		{