diff --git a/Main/src/main/java/com/chameleonvision/web/SocketHandler.java b/Main/src/main/java/com/chameleonvision/web/SocketHandler.java
index 48be65c14..d147cac94 100644
--- a/Main/src/main/java/com/chameleonvision/web/SocketHandler.java
+++ b/Main/src/main/java/com/chameleonvision/web/SocketHandler.java
@@ -67,12 +67,13 @@ public class SocketHandler {
                     }
                     case "changeCameraName": {
                         currentCamera.getProperties().setNickname((String) entry.getValue());
+                        currentProcess.setCameraName((String) entry.getValue());
                         sendFullSettings();
                         VisionManager.saveCurrentCameraSettings();
                         break;
                     }
                     case "changePipelineName": {
-                        currentProcess.setCameraName((String) entry.getValue());
+                        currentProcess.pipelineManager.renameCurrentPipeline((String) entry.getValue());
                         sendFullSettings();
                         VisionManager.saveCurrentCameraPipelines();
                         break;