diff --git a/include/z64math.h b/include/z64math.h
index cc8228316d..acbc95a7c5 100644
--- a/include/z64math.h
+++ b/include/z64math.h
@@ -100,7 +100,7 @@ typedef struct {
 #define DEG_TO_BINANG(degrees) (s16)((degrees) * (0x8000 / 180.0f))
 #define DEG_TO_BINANG_ALT(degreesf) (s16)((degreesf) * 182.04167f + .5f)
 #define RAD_TO_BINANG(radf) (s16)((radf) * (0x8000 / M_PI))
-#define RADF_TO_DEGF(radf) ((radf) * (180.0f / M_PI))
+#define RAD_TO_DEG(radf) ((radf) * (180.0f / M_PI))
 #define DEG_TO_RAD(degrees) ((degrees) * (M_PI / 180.0f))
 #define BINANG_TO_DEG(binang) ((f32)(binang) * (180.0f / 0x8000))
 #define BINANG_TO_DEG_ALT(binang) ((f32)(binang) * (360.0001525f / 65535.0f))
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index fcb76a6ad6..2dbf8c8e79 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -565,7 +565,7 @@ f32 Camera_GetWaterSurface(Camera* camera, Vec3f* chkPos, s32* envProp) {
  * Calculates the angle between points `from` and `to`
  */
 s16 Camera_XZAngle(Vec3f* to, Vec3f* from) {
-    return DEG_TO_BINANG_ALT(RADF_TO_DEGF(Math_FAtan2F(from->x - to->x, from->z - to->z)));
+    return DEG_TO_BINANG_ALT(RAD_TO_DEG(Math_FAtan2F(from->x - to->x, from->z - to->z)));
 }
 
 s16 func_80044ADC(Camera* camera, s16 yaw, s16 arg2) {
@@ -630,8 +630,8 @@ s16 func_80044ADC(Camera* camera, s16 yaw, s16 arg2) {
     }
     phi_f16 = PCT(OREG(20)) * (D_8015CE50 - camera->playerGroundY);
     phi_f18 = (1.0f - PCT(OREG(20))) * (D_8015CE54 - camera->playerGroundY);
-    temp_s0 = DEG_TO_BINANG_ALT(RADF_TO_DEGF(Math_FAtan2F(phi_f16, sp30)));
-    temp_s1 = DEG_TO_BINANG_ALT(RADF_TO_DEGF(Math_FAtan2F(phi_f18, sp2C)));
+    temp_s0 = DEG_TO_BINANG_ALT(RAD_TO_DEG(Math_FAtan2F(phi_f16, sp30)));
+    temp_s1 = DEG_TO_BINANG_ALT(RAD_TO_DEG(Math_FAtan2F(phi_f18, sp2C)));
     return temp_s0 + temp_s1;
 }
 
diff --git a/src/code/z_olib.c b/src/code/z_olib.c
index 7400ae513b..4b57118ff8 100644
--- a/src/code/z_olib.c
+++ b/src/code/z_olib.c
@@ -117,14 +117,14 @@ VecSph* OLib_Vec3fToVecSph(VecSph* dest, Vec3f* vec) {
     if ((dist == 0.0f) && (vec->y == 0.0f)) {
         sph.pitch = 0;
     } else {
-        sph.pitch = DEG_TO_BINANG_ALT(RADF_TO_DEGF(Math_FAtan2F(dist, vec->y)));
+        sph.pitch = DEG_TO_BINANG_ALT(RAD_TO_DEG(Math_FAtan2F(dist, vec->y)));
     }
 
     sph.r = sqrtf(SQ(vec->y) + distSquared);
     if ((vec->x == 0.0f) && (vec->z == 0.0f)) {
         sph.yaw = 0;
     } else {
-        sph.yaw = DEG_TO_BINANG_ALT(RADF_TO_DEGF(Math_FAtan2F(vec->x, vec->z)));
+        sph.yaw = DEG_TO_BINANG_ALT(RAD_TO_DEG(Math_FAtan2F(vec->x, vec->z)));
     }
 
     *dest = sph;
@@ -196,8 +196,8 @@ Vec3f* OLib_Vec3fDiffDegF(Vec3f* dest, Vec3f* a, Vec3f* b) {
 
     OLib_Vec3fDiffRad(&anglesRad, a, b);
 
-    anglesDegrees.x = RADF_TO_DEGF(anglesRad.x);
-    anglesDegrees.y = RADF_TO_DEGF(anglesRad.y);
+    anglesDegrees.x = RAD_TO_DEG(anglesRad.x);
+    anglesDegrees.y = RAD_TO_DEG(anglesRad.y);
     anglesDegrees.z = 0.0f;
 
     *dest = anglesDegrees;
@@ -214,8 +214,8 @@ Vec3s* OLib_Vec3fDiffBinAng(Vec3s* dest, Vec3f* a, Vec3f* b) {
 
     OLib_Vec3fDiffRad(&anglesRad, a, b);
 
-    anglesBinAng.x = DEG_TO_BINANG_ALT(RADF_TO_DEGF(anglesRad.x));
-    anglesBinAng.y = DEG_TO_BINANG_ALT(RADF_TO_DEGF(anglesRad.y));
+    anglesBinAng.x = DEG_TO_BINANG_ALT(RAD_TO_DEG(anglesRad.x));
+    anglesBinAng.y = DEG_TO_BINANG_ALT(RAD_TO_DEG(anglesRad.y));
     anglesBinAng.z = 0.0f;
 
     *dest = anglesBinAng;
diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c
index 2a693cdf09..48ac424682 100644
--- a/src/code/z_onepointdemo.c
+++ b/src/code/z_onepointdemo.c
@@ -22,7 +22,7 @@ void OnePointCutscene_AddVecSphToVec3f(Vec3f* dst, Vec3f* src, VecSph* vecSph) {
 }
 
 s16 OnePointCutscene_Vec3fYaw(Vec3f* vec1, Vec3f* vec2) {
-    return DEG_TO_BINANG_ALT(RADF_TO_DEGF(Math_FAtan2F(vec2->x - vec1->x, vec2->z - vec1->z)));
+    return DEG_TO_BINANG_ALT(RAD_TO_DEG(Math_FAtan2F(vec2->x - vec1->x, vec2->z - vec1->z)));
 }
 
 void OnePointCutscene_Vec3sToVec3f(Vec3f* src, Vec3s* dst) {