diff --git a/src/p_maputl.c b/src/p_maputl.c
index 28f35f7c..5453ceeb 100644
--- a/src/p_maputl.c
+++ b/src/p_maputl.c
@@ -436,7 +436,7 @@ static void P_SetThingPosition_MBF(mobj_t *thing)
 void (*P_UnsetThingPosition)(struct mobj_s *thing) = P_UnsetThingPosition_MBF;
 void (*P_SetThingPosition)(struct mobj_s *thing) = P_SetThingPosition_MBF;
 
-void P_SetThingPosition_Funcs (void)
+void P_SetThingPosition_SetFuncs(void)
 {
 #ifndef MBF_STRICT
     if (demo_version < DV_MBF)
@@ -445,11 +445,11 @@ void P_SetThingPosition_Funcs (void)
         P_SetThingPosition = P_SetThingPosition_Boom;
     }
     else
-#endif
     {
         P_UnsetThingPosition = P_UnsetThingPosition_MBF;
         P_SetThingPosition = P_SetThingPosition_MBF;
     }
+#endif
 }
 
 // killough 3/15/98:
diff --git a/src/p_maputl.h b/src/p_maputl.h
index f9a0d1ba..7e0e0862 100644
--- a/src/p_maputl.h
+++ b/src/p_maputl.h
@@ -78,7 +78,7 @@ struct mobj_s *P_RoughTargetSearch(struct mobj_s *mo, angle_t fov, int distance)
 boolean P_SightPathTraverse(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2);
 boolean PTR_SightTraverse(intercept_t *in);
 boolean P_CheckSight_12(struct mobj_s *t1, struct mobj_s *t2);
-void P_SetThingPosition_Funcs (void);
+void P_SetThingPosition_SetFuncs (void);
 
 extern fixed_t opentop;
 extern fixed_t openbottom;
diff --git a/src/p_setup.c b/src/p_setup.c
index 5f6597f2..7dbf4e2c 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -1715,7 +1715,7 @@ void P_SetupLevel(int episode, int map, int playermask, skill_t skill)
   deathmatch_p = deathmatchstarts;
   P_MapStart();
 
-  P_SetThingPosition_Funcs();
+  P_SetThingPosition_SetFuncs();
 
   P_LoadThings(lumpnum+ML_THINGS);