diff --git a/Main/src/main/java/com/chameleonvision/vision/VisionProcess.java b/Main/src/main/java/com/chameleonvision/vision/VisionProcess.java
index 8e8ec575e..a163f145d 100644
--- a/Main/src/main/java/com/chameleonvision/vision/VisionProcess.java
+++ b/Main/src/main/java/com/chameleonvision/vision/VisionProcess.java
@@ -91,6 +91,13 @@ public class VisionProcess {
         initNT(newTable);
     }
 
+    public void setCameraName(String newName) {
+        var newTable = NetworkTableInstance.getDefault().getTable("/chameleon-vision/" + newName);
+        resetNT(newTable);
+        pipelineManager.renameCurrentPipeline(newName);
+        pipelineManager.ntIndexEntry = ntPipelineEntry;
+    }
+
     private void initNT(NetworkTable newTable) {
         ntPipelineEntry = newTable.getEntry("pipeline");
         ntDriverModeEntry = newTable.getEntry("driver_mode");
diff --git a/Main/src/main/java/com/chameleonvision/web/SocketHandler.java b/Main/src/main/java/com/chameleonvision/web/SocketHandler.java
index 84d6de42d..48be65c14 100644
--- a/Main/src/main/java/com/chameleonvision/web/SocketHandler.java
+++ b/Main/src/main/java/com/chameleonvision/web/SocketHandler.java
@@ -10,6 +10,7 @@ import com.chameleonvision.vision.pipeline.CVPipelineSettings;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import edu.wpi.first.networktables.NetworkTable;
 import io.javalin.websocket.WsBinaryMessageContext;
 import io.javalin.websocket.WsCloseContext;
 import io.javalin.websocket.WsConnectContext;
@@ -71,7 +72,7 @@ public class SocketHandler {
                         break;
                     }
                     case "changePipelineName": {
-                        currentProcess.pipelineManager.renameCurrentPipeline((String) entry.getValue());
+                        currentProcess.setCameraName((String) entry.getValue());
                         sendFullSettings();
                         VisionManager.saveCurrentCameraPipelines();
                         break;