diff --git a/web/skins/classic/views/js/controlcap.js b/web/skins/classic/views/js/controlcap.js
index 52c428e28..b41e25cb5 100644
--- a/web/skins/classic/views/js/controlcap.js
+++ b/web/skins/classic/views/js/controlcap.js
@@ -1,101 +1,101 @@
 function validateForm( form ) {
-  var errors = new Array();
+  const errors = new Array();
 
   // If "Can Move" is enabled, then the end user must also select at least one of the other check boxes (excluding Can Move Diagonally)
-  if ( form.elements['newControl[CanMove]'].checked ) {
+  if ( form.elements['Control[CanMove]'].checked ) {
     if ( !(
-      form.elements['newControl[CanMoveCon]'].checked ||
-      form.elements['newControl[CanMoveRel]'].checked ||
-      form.elements['newControl[CanMoveAbs]'].checked ||
-      form.elements['newControl[CanMoveMap]'].checked
+      form.elements['Control[CanMoveCon]'].checked ||
+      form.elements['Control[CanMoveRel]'].checked ||
+      form.elements['Control[CanMoveAbs]'].checked ||
+      form.elements['Control[CanMoveMap]'].checked
     ) ) {
       errors[errors.length] = 'In addition to "Can Move", you also must select at least one of: "Can Move Mapped", "Can Move Absolute", "Can Move Relative", or "Can Move Continuous"';
     }
   } else {
     // Now lets check for the opposite condition. If any of the boxes below Can Move are checked, but Can Move is not checked then signal an error
 
-    if ( form.elements['newControl[CanMoveCon]'].checked ||
-      form.elements['newControl[CanMoveRel]'].checked ||
-      form.elements['newControl[CanMoveAbs]'].checked ||
-      form.elements['newControl[CanMoveMap]'].checked ||
-      form.elements['newControl[CanMoveDiag]'].checked
+    if ( form.elements['Control[CanMoveCon]'].checked ||
+      form.elements['Control[CanMoveRel]'].checked ||
+      form.elements['Control[CanMoveAbs]'].checked ||
+      form.elements['Control[CanMoveMap]'].checked ||
+      form.elements['Control[CanMoveDiag]'].checked
     ) {
       errors[errors.length] = '"Can Move" must also be selected if any one of the movement types are selected.';
     }
   }
   // If "Can Zoom" is enabled, then the end user must also select at least one of the other check boxes
-  if ( form.elements['newControl[CanZoom]'].checked ) {
+  if ( form.elements['Control[CanZoom]'].checked ) {
     if ( !(
-      form.elements['newControl[CanZoomCon]'].checked ||
-      form.elements['newControl[CanZoomRel]'].checked ||
-      form.elements['newControl[CanZoomAbs]'].checked
+      form.elements['Control[CanZoomCon]'].checked ||
+      form.elements['Control[CanZoomRel]'].checked ||
+      form.elements['Control[CanZoomAbs]'].checked
     ) ) {
       errors[errors.length] = 'In addition to "Can Zoom", you also must select at least one of: "Can Zoom Absolute", "Can Zoom Relative", or "Can Zoom Continuous"';
     }
   } else {
     // Now lets check for the opposite condition. If any of the boxes below Can Zoom are checked, but Can Zoom is not checked then signal an error
 
-    if ( form.elements['newControl[CanZoomCon]'].checked ||
-      form.elements['newControl[CanZoomRel]'].checked ||
-      form.elements['newControl[CanZoomAbs]'].checked
+    if ( form.elements['Control[CanZoomCon]'].checked ||
+      form.elements['Control[CanZoomRel]'].checked ||
+      form.elements['Control[CanZoomAbs]'].checked
     ) {
       errors[errors.length] = '"Can Move" must also be selected if any one of the zoom types are selected.';
     }
   }
   // If "Can Zoom" is enabled, then the end user must also select at least one of the other check boxes
-  if ( form.elements['newControl[CanFocus]'].checked ) {
+  if ( form.elements['Control[CanFocus]'].checked ) {
     if ( !(
-      form.elements['newControl[CanFocusCon]'].checked ||
-      form.elements['newControl[CanFocusRel]'].checked ||
-      form.elements['newControl[CanFocusAbs]'].checked
+      form.elements['Control[CanFocusCon]'].checked ||
+      form.elements['Control[CanFocusRel]'].checked ||
+      form.elements['Control[CanFocusAbs]'].checked
     ) ) {
       errors[errors.length] = 'In addition to "Can Focus", you also must select at least one of: "Can Focus Absolute", "Can Focus Relative", or "Can Focus Continuous"';
     }
   } else {
     // Now lets check for the opposite condition. If any of the boxes below Can Zoom are checked, but Can Zoom is not checked then signal an error
 
-    if ( form.elements['newControl[CanFocusCon]'].checked ||
-      form.elements['newControl[CanFocusRel]'].checked ||
-      form.elements['newControl[CanFocusAbs]'].checked
+    if ( form.elements['Control[CanFocusCon]'].checked ||
+      form.elements['Control[CanFocusRel]'].checked ||
+      form.elements['Control[CanFocusAbs]'].checked
     ) {
       errors[errors.length] = '"Can Focus" must also be selected if any one of the focus types are selected.';
     }
   }
   // If "Can White" is enabled, then the end user must also select at least one of the other check boxes
-  if ( form.elements['newControl[CanWhite]'].checked ) {
+  if ( form.elements['Control[CanWhite]'].checked ) {
     if ( !(
-      form.elements['newControl[CanWhiteCon]'].checked ||
-      form.elements['newControl[CanWhiteRel]'].checked ||
-      form.elements['newControl[CanWhiteAbs]'].checked
+      form.elements['Control[CanWhiteCon]'].checked ||
+      form.elements['Control[CanWhiteRel]'].checked ||
+      form.elements['Control[CanWhiteAbs]'].checked
     ) ) {
       errors[errors.length] = 'In addition to "Can White Balance", you also must select at least one of: "Can White Bal Absolute", "Can White Bal Relative", or "Can White Bal Continuous"';
     }
   } else {
     // Now lets check for the opposite condition. If any of the boxes below Can Zoom are checked, but Can Zoom is not checked then signal an error
 
-    if ( form.elements['newControl[CanWhiteCon]'].checked ||
-      form.elements['newControl[CanWhiteRel]'].checked ||
-      form.elements['newControl[CanWhiteAbs]'].checked
+    if ( form.elements['Control[CanWhiteCon]'].checked ||
+      form.elements['Control[CanWhiteRel]'].checked ||
+      form.elements['Control[CanWhiteAbs]'].checked
     ) {
       errors[errors.length] = '"Can White Balance" must also be selected if any one of the white balance types are selected.';
     }
   }
 
   // If "Can Iris" is enabled, then the end user must also select at least one of the other check boxes
-  if ( form.elements['newControl[CanIris]'].checked ) {
+  if ( form.elements['Control[CanIris]'].checked ) {
     if ( !(
-      form.elements['newControl[CanIrisCon]'].checked ||
-      form.elements['newControl[CanIrisRel]'].checked ||
-      form.elements['newControl[CanIrisAbs]'].checked
+      form.elements['Control[CanIrisCon]'].checked ||
+      form.elements['Control[CanIrisRel]'].checked ||
+      form.elements['Control[CanIrisAbs]'].checked
     ) ) {
       errors[errors.length] = 'In addition to "Can Iris", you also must select at least one of: "Can Iris Absolute", "Can Iris Relative", or "Can Iris Continuous"';
     }
   } else {
     // Now lets check for the opposite condition. If any of the boxes below Can Zoom are checked, but Can Zoom is not checked then signal an error
 
-    if ( form.elements['newControl[CanIrisCon]'].checked ||
-      form.elements['newControl[CanIrisRel]'].checked ||
-      form.elements['newControl[CanIrisAbs]'].checked
+    if ( form.elements['Control[CanIrisCon]'].checked ||
+      form.elements['Control[CanIrisRel]'].checked ||
+      form.elements['Control[CanIrisAbs]'].checked
     ) {
       errors[errors.length] = '"Can Iris" must also be selected if any one of the iris types are selected.';
     }