diff --git a/src/main/java/frc/robot/commands/scoring/algae/AlgaeClawTeleop.java b/src/main/java/frc/robot/commands/scoring/algae/AlgaeClawTeleop.java
index 13844b7..d73f194 100644
--- a/src/main/java/frc/robot/commands/scoring/algae/AlgaeClawTeleop.java
+++ b/src/main/java/frc/robot/commands/scoring/algae/AlgaeClawTeleop.java
@@ -32,9 +32,9 @@ public void execute() {
         claw.setClawMotor(clawSpeed * 0.5);
         // claw.setPivotMotor(pivotSpeed * 0.05);
 
-        // SmartDashboard.putNumber("Algae Pivot Encoder Ticks", claw.getPivotEncoderTicks());
+        // SmartDashboard.putNumber("Algae Pivot/Encoder Ticks", claw.getPivotEncoderTicks());
 
-        SmartDashboard.putNumber("Algae Claw Current", claw.getClawMotor().getOutputCurrent()); // TODO use this to identify the current max for deadbanding
+        SmartDashboard.putNumber("Algae Claw/Current", claw.getClawMotor().getOutputCurrent()); // TODO use this to identify the current max for deadbanding
     }
 
     @Override
diff --git a/src/main/java/frc/robot/commands/scoring/algae/AlgaePivotPreset.java b/src/main/java/frc/robot/commands/scoring/algae/AlgaePivotPreset.java
index 2f68a11..1662237 100644
--- a/src/main/java/frc/robot/commands/scoring/algae/AlgaePivotPreset.java
+++ b/src/main/java/frc/robot/commands/scoring/algae/AlgaePivotPreset.java
@@ -37,9 +37,9 @@ public void initialize() {
     @Override
     public void execute() {
         
-        SmartDashboard.putNumber("Algae Encoder Ticks", claw.getPivotEncoderTicks());
-        SmartDashboard.putNumber("Algae Pivot", claw.getPivotMotor().get());
-        SmartDashboard.putNumber("Algae Pivot Applied", claw.getPivotMotor().getAppliedOutput());
+        SmartDashboard.putNumber("Algae Pivot/Encoder Ticks", claw.getPivotEncoderTicks());
+        SmartDashboard.putNumber("Algae Pivot/Motor", claw.getPivotMotor().get());
+        SmartDashboard.putNumber("Algae Pivot/Applied", claw.getPivotMotor().getAppliedOutput());
         
     }
 
diff --git a/src/main/java/frc/robot/subsystems/camera/AprilTagCamera.java b/src/main/java/frc/robot/subsystems/camera/AprilTagCamera.java
index 46d2682..25e414c 100644
--- a/src/main/java/frc/robot/subsystems/camera/AprilTagCamera.java
+++ b/src/main/java/frc/robot/subsystems/camera/AprilTagCamera.java
@@ -43,7 +43,7 @@ public AprilTagCamera(String cameraName, Transform3d robotToCamera, CommandSwerv
         this.drivetrain = drivetrain;
 
         cameraEnabled = new SendableChooser<Boolean>();
-        cameraEnabled.setDefaultOption("Enabled", true);
+        cameraEnabled.setDefaultOption(cameraName + "/Enabled", true);
         cameraEnabled.addOption("Disabled", false);
         SmartDashboard.putData(String.format("%s Enabled?", cameraName), cameraEnabled);
 
@@ -61,13 +61,13 @@ public void periodic() {
             boolean hasPose = false;
 
             if (result.hasTargets()) {
-                SmartDashboard.putNumber("Target Count", result.targets.size());
+                SmartDashboard.putNumber(cameraName + "/Target Count", result.targets.size());
 
                 for (PhotonTrackedTarget target : result.targets) {
-                    SmartDashboard.putNumber("Target ID", target.getFiducialId());
-                    SmartDashboard.putNumber("Yaw", target.getYaw());
-                    SmartDashboard.putNumber("Pitch", target.getPitch());
-                    SmartDashboard.putNumber("Area", target.getArea());
+                    SmartDashboard.putNumber(cameraName + "/Target ID", target.getFiducialId());
+                    SmartDashboard.putNumber(cameraName + "/Yaw", target.getYaw());
+                    SmartDashboard.putNumber(cameraName + "/Pitch", target.getPitch());
+                    SmartDashboard.putNumber(cameraName + "/Area", target.getArea());
 
                     for (int tag : Constants.AutoDriveConstants.GOOD_APRIL_TAGS) {
                         if (target.getFiducialId() == tag) {
@@ -90,7 +90,7 @@ public void periodic() {
                         if (this.cameraEnabled.getSelected()) {
                             drivetrain.addVisionMeasurement(visionPose.toPose2d(), Utils.getCurrentTimeSeconds());
                         }
-                        SmartDashboard.putString("Vision Pose", visionPose.toString());
+                        SmartDashboard.putString(cameraName + "/Vision Pose", visionPose.toString());
                     }
                 }
             } else {
diff --git a/src/main/java/frc/robot/subsystems/elevator/Elevator.java b/src/main/java/frc/robot/subsystems/elevator/Elevator.java
index e603d87..71f5d34 100644
--- a/src/main/java/frc/robot/subsystems/elevator/Elevator.java
+++ b/src/main/java/frc/robot/subsystems/elevator/Elevator.java
@@ -141,10 +141,10 @@ public void periodic() {
             ArbFFUnits.kVoltage
         );
 
-        SmartDashboard.putNumber("Current State Ticks", currentState.position);
-        SmartDashboard.putNumber("Current State Velocity", currentState.velocity);
-        SmartDashboard.putNumber("Goal State Ticks", goalState.position);
-        SmartDashboard.putNumber("Current Ticks", this.getAvgEncoderTicks());
+        SmartDashboard.putNumber("Elevator/Current State Ticks", currentState.position);
+        SmartDashboard.putNumber("Elevator/Current State Velocity", currentState.velocity);
+        SmartDashboard.putNumber("Elevator/Goal State Ticks", goalState.position);
+        SmartDashboard.putNumber("Elevator/Current Ticks", this.getAvgEncoderTicks());
     }
 
     public Command sysIdDynamic(Direction direction) {
diff --git a/src/main/java/frc/robot/subsystems/scoring/AlgaeClaw.java b/src/main/java/frc/robot/subsystems/scoring/AlgaeClaw.java
index 0fd8492..4ad4fc9 100644
--- a/src/main/java/frc/robot/subsystems/scoring/AlgaeClaw.java
+++ b/src/main/java/frc/robot/subsystems/scoring/AlgaeClaw.java
@@ -62,10 +62,10 @@ public boolean holdingAlgae() {
 
     @Override
     public void periodic() {
-        SmartDashboard.putNumber("Claw Motor Speed", clawMotor.get());
-        SmartDashboard.putNumber("Color Sensor Proximity", this.colorSensor.getProximity());
-        SmartDashboard.putNumber("Color Sensor Blue", this.colorSensor.getBlue());
-        SmartDashboard.putNumber("Color Sensor Test", this.colorSensor.getRed());
+        SmartDashboard.putNumber("Algae Claw/Claw Motor Speed", clawMotor.get());
+        SmartDashboard.putNumber("Algae Claw/Color Sensor Proximity", this.colorSensor.getProximity());
+        SmartDashboard.putNumber("Algae Claw/Color Sensor Blue", this.colorSensor.getBlue());
+        SmartDashboard.putNumber("Algae Claw/Color Sensor Test", this.colorSensor.getRed());
 
         if (this.timer.hasElapsed(PULSE_FREQUENCY) && this.getClawMotor().get() == 0.0 && this.holdingAlgae()) {
             CommandScheduler.getInstance().schedule(new InstantCommand(() -> {
diff --git a/src/main/java/frc/robot/subsystems/scoring/AlgaePivot.java b/src/main/java/frc/robot/subsystems/scoring/AlgaePivot.java
index c90f267..82cea8a 100644
--- a/src/main/java/frc/robot/subsystems/scoring/AlgaePivot.java
+++ b/src/main/java/frc/robot/subsystems/scoring/AlgaePivot.java
@@ -87,7 +87,7 @@ public void periodic() {
             ClosedLoopSlot.kSlot0
         );
 
-        SmartDashboard.putNumber("Pivot Setpoint", setpointTicks);
-        SmartDashboard.putNumber("Pivot Current Position", currentState.position);
+        SmartDashboard.putNumber("Algae Pivot/Setpoint", setpointTicks);
+        SmartDashboard.putNumber("Algae Pivot/Current Position", currentState.position);
     }
 }
diff --git a/src/main/java/frc/robot/subsystems/scoring/CoralShooter.java b/src/main/java/frc/robot/subsystems/scoring/CoralShooter.java
index 3473640..a7c134d 100644
--- a/src/main/java/frc/robot/subsystems/scoring/CoralShooter.java
+++ b/src/main/java/frc/robot/subsystems/scoring/CoralShooter.java
@@ -82,7 +82,7 @@ public double getAvgEncoderTicks() {
 
     @Override
     public void periodic() {
-        SmartDashboard.putBoolean("BEAM EXISTS CORAL SHOOTER", this.beamExists());
+        SmartDashboard.putBoolean("CORAL SHOOTER/BEAM EXISTS", this.beamExists());
     }
 
 }