diff --git a/camera-config/HandCameraCalibration.yml b/camera-config/HandCameraCalibration.yml
index 158cddb9b..4197a3811 100644
--- a/camera-config/HandCameraCalibration.yml
+++ b/camera-config/HandCameraCalibration.yml
@@ -3,7 +3,7 @@
 name: "hand"
 description: "Camera located on the hand of the rover."
 # Make sure that this camera_id matches the one defined in the udev rules.
-camera_id: 40
+camera_id: 20
 calib_info:
    calibration_time: "Sat 01 May 2021 01:54:16 PM PDT"
    board_width: 11
diff --git a/camera-config/MastCameraCalibration.yml b/camera-config/MastCameraCalibration.yml
index b812719dd..6870d4dcc 100644
--- a/camera-config/MastCameraCalibration.yml
+++ b/camera-config/MastCameraCalibration.yml
@@ -3,7 +3,7 @@
 name: "mast"
 description: "Camera located on the mast of the rover."
 # Make sure that this camera_id matches the one defined in the udev rules.
-camera_id: 20
+camera_id: 40
 calib_info:
    calibration_time: "Sat 01 May 2021 01:54:16 PM PDT"
    board_width: 11
diff --git a/src/Constants.h b/src/Constants.h
index fbece020c..d35f4da3f 100644
--- a/src/Constants.h
+++ b/src/Constants.h
@@ -59,14 +59,14 @@ const double MAX_DTHETA = kinematics::DiffDriveKinematics(EFF_WHEEL_BASE)
 // TODO: We need to recalibrate the camera, since we replaced it with a different one.
 // TODO: rename cameras (in MC as well) as appropriate
 constexpr const char* MAST_CAMERA_CONFIG_PATH = "../camera-config/MastCameraCalibration.yml";
-const robot::types::CameraID MAST_CAMERA_ID = "front"; // TODO: replace with real camera name
+const robot::types::CameraID MAST_CAMERA_ID = "upperArm"; // TODO: replace with real camera name
 
 constexpr const char* FOREARM_CAMERA_CONFIG_PATH =
 	"../camera-config/ForearmCameraCalibration.yml";
 const robot::types::CameraID FOREARM_CAMERA_ID = "rear";
 
 constexpr const char* HAND_CAMERA_CONFIG_PATH = "../camera-config/HandCameraCalibration.yml";
-const robot::types::CameraID HAND_CAMERA_ID = "upperArm";
+const robot::types::CameraID HAND_CAMERA_ID = "front";
 
 /**
    @deprecated No need for this constant once we fully switch over the Mission Control PlanViz