diff --git a/source/games/sw/src/draw.cpp b/source/games/sw/src/draw.cpp
index 332aa3ae0..96743137a 100644
--- a/source/games/sw/src/draw.cpp
+++ b/source/games/sw/src/draw.cpp
@@ -1354,7 +1354,7 @@ void drawscreen(PLAYER* pp, double smoothratio, bool sceneonly)
     fixedhoriz thoriz;
     sectortype* tsect;
     short i,j;
-    int bob_amt = 0;
+    int bobamt = 0;
     int quake_z, quake_x, quake_y;
     short quake_ang;
     extern bool FAF_DebugView;
@@ -1452,7 +1452,7 @@ void drawscreen(PLAYER* pp, double smoothratio, bool sceneonly)
     }
     else
     {
-        bob_amt = camerapp->pbob_amt * zworldtoint;
+        bobamt = camerapp->pbob_amt * zworldtoint;
 
         if (CameraTestMode)
         {
@@ -1464,7 +1464,7 @@ void drawscreen(PLAYER* pp, double smoothratio, bool sceneonly)
     {
         if (cl_viewbob)
         {
-            tz += bob_amt;
+            tz += bobamt;
             tz += interpolatedvalue(pp->obob_z, pp->bob_z, smoothratio) * zworldtoint;
         }
 
diff --git a/source/games/sw/src/panel.cpp b/source/games/sw/src/panel.cpp
index 8cd4f322b..6aaea5e34 100644
--- a/source/games/sw/src/panel.cpp
+++ b/source/games/sw/src/panel.cpp
@@ -6344,9 +6344,9 @@ void pWeaponBob(PANEL_SPRITE* psp, short condition)
         // proportion
         double bob_ndx = (psp->sin_ndx + 512) & 1023;
 
-        // base bob_amt on the players velocity - Max of 128
-        double bob_amt = bobvel / psp->bob_height_divider;
-        ydiff = bob_amt * bsinf(bob_ndx, -14);
+        // base bob amt on the players velocity - Max of 128
+        double bobamt = bobvel / psp->bob_height_divider;
+        ydiff = bobamt * bsinf(bob_ndx, -14);
     }
 
     // Back up current coordinates for interpolating.
diff --git a/source/games/sw/src/player.cpp b/source/games/sw/src/player.cpp
index 25f88a381..96b4b6244 100644
--- a/source/games/sw/src/player.cpp
+++ b/source/games/sw/src/player.cpp
@@ -1640,10 +1640,10 @@ void DoPlayerRecoil(PLAYER* pp)
 
 
 // for wading
-void DoPlayerSpriteBob(PLAYER* pp, double player_height, double bob_amt, short bob_speed)
+void DoPlayerSpriteBob(PLAYER* pp, double player_height, double bobamt, short bob_speed)
 {
     pp->bob_ndx = (pp->bob_ndx + (synctics << bob_speed)) & 2047;
-    pp->pbob_amt = bob_amt * DAngle::fromBuild(pp->bob_ndx).Sin();
+    pp->pbob_amt = bobamt * DAngle::fromBuild(pp->bob_ndx).Sin();
     pp->actor->spr.pos.Z = pp->pos.Z + player_height + pp->pbob_amt;
 }
 
@@ -3471,13 +3471,13 @@ void DoPlayerBeginFly(PLAYER* pp)
     NewStateGroup(pp->actor, sg_PlayerNinjaFly);
 }
 
-int GetSinNdx(int range, int bob_amt)
+int GetSinNdx(int range, int bobamt)
 {
     int amt;
 
     amt = Z(512) / range;
 
-    return bob_amt * amt;
+    return bobamt * amt;
 }
 
 void PlayerWarpUpdatePos(PLAYER* pp)
@@ -4382,7 +4382,7 @@ void DoPlayerDive(PLAYER* pp)
     // player is moving
     else
     {
-        // if bob_amt is approx 0
+        // if bob amt is approx 0
         if (abs(pp->pbob_amt) < 1)
         {
             pp->pbob_amt = 0;
diff --git a/source/games/sw/src/track.cpp b/source/games/sw/src/track.cpp
index 09b3bef05..4d9a3c8a4 100644
--- a/source/games/sw/src/track.cpp
+++ b/source/games/sw/src/track.cpp
@@ -2394,7 +2394,7 @@ DVector2 DoTrack(SECTOR_OBJECT* sop, short locktics)
             sop->zdelta = tpoint->tag_high;
             break;
         case TRACK_ZRATE:
-            sop->z_rate = Z(tpoint->tag_high);
+            sop->z_rate = Z(tpoint->tag_high); // looks like a bug. z_rate is pixel based.
             break;
         case TRACK_ZUP:
             sop->flags &= ~(SOBJ_ZDOWN | SOBJ_ZUP);