diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
index 552291c186..300bcd46f0 100644
--- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
@@ -248,7 +248,7 @@ Item {
 
         //dont rise local keyboard
         keyboardEnabled = !root.isTablet && HMD.active;
-        //but rise Tablet's one instead for Tablets interface
+        //but rise Tablet's one instead for Tablet interface
         if (root.isTablet) {
             root.keyboardEnabled = HMD.active;
             root.keyboardRaised = Qt.binding( function() { return keyboardRaised; })
diff --git a/interface/resources/qml/LoginDialog/SignUpBody.qml b/interface/resources/qml/LoginDialog/SignUpBody.qml
index e521e16a60..9d55998b40 100644
--- a/interface/resources/qml/LoginDialog/SignUpBody.qml
+++ b/interface/resources/qml/LoginDialog/SignUpBody.qml
@@ -221,7 +221,7 @@ Item {
         root.iconText = "<"
         //dont rise local keyboard
         keyboardEnabled = !root.isTablet && HMD.active;
-        //but rise Tablet's one instead for Tablets interface
+        //but rise Tablet's one instead for Tablet interface
         if (root.isTablet) {
             root.keyboardEnabled = HMD.active;
             root.keyboardRaised = Qt.binding( function() { return keyboardRaised; })
diff --git a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
index 185cbd9d47..5c212578b8 100644
--- a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
+++ b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
@@ -131,7 +131,7 @@ Item {
         root.iconText = "<"
         //dont rise local keyboard
         keyboardEnabled = !root.isTablet && HMD.active;
-        //but rise Tablet's one instead for Tablets interface
+        //but rise Tablet's one instead for Tablet interface
         if (root.isTablet) {
             root.keyboardEnabled = HMD.active;
             root.keyboardRaised = Qt.binding( function() { return keyboardRaised; })
diff --git a/scripts/developer/tests/dynamics/dynamicsTests.js b/scripts/developer/tests/dynamics/dynamicsTests.js
index fa51403732..c0b001eab3 100644
--- a/scripts/developer/tests/dynamics/dynamicsTests.js
+++ b/scripts/developer/tests/dynamics/dynamicsTests.js
@@ -11,7 +11,7 @@
 
 "use strict";
 
-/* global Entities, Script, Tablets, MyAvatar, Vec3 */
+/* global Entities, Script, Tablet, MyAvatar, Vec3 */
 
 (function() { // BEGIN LOCAL_SCOPE
 
diff --git a/scripts/developer/tests/tabletEventBridgeTest.js b/scripts/developer/tests/tabletEventBridgeTest.js
index d386b220fc..83031741fc 100644
--- a/scripts/developer/tests/tabletEventBridgeTest.js
+++ b/scripts/developer/tests/tabletEventBridgeTest.js
@@ -11,7 +11,7 @@
 // Adds a button to the tablet that will switch to a web page.
 // This web page contains buttons that will use the event bridge to trigger sounds.
 
-/* globals Tablets */
+/* globals Tablet */
 
 
 var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
diff --git a/scripts/developer/utilities/render/photobooth/photoboothApp.js b/scripts/developer/utilities/render/photobooth/photoboothApp.js
index 0e8eef7352..154028f091 100644
--- a/scripts/developer/utilities/render/photobooth/photoboothApp.js
+++ b/scripts/developer/utilities/render/photobooth/photoboothApp.js
@@ -8,7 +8,7 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
-/* globals Tablets, Toolbars, Script, HMD, Controller, Menu */
+/* globals Tablet, Toolbars, Script, HMD, Controller, Menu */
 (function () {
     var SNAPSHOT_DELAY = 500; // 500ms
     var PHOTOBOOTH_WINDOW_HTML_URL = Script.resolvePath("./html/photobooth.html");
diff --git a/scripts/system/audioMuteOverlay.js b/scripts/system/audioMuteOverlay.js
index 0db4edb85d..731d62017d 100644
--- a/scripts/system/audioMuteOverlay.js
+++ b/scripts/system/audioMuteOverlay.js
@@ -1,6 +1,6 @@
 "use strict";
 /* jslint vars: true, plusplus: true, forin: true*/
-/* globals Tablets, Script, AvatarList, Users, Entities, MyAvatar, Camera, Overlays, Vec3, Quat, Controller, print, getControllerWorldLocation */
+/* globals Tablet, Script, AvatarList, Users, Entities, MyAvatar, Camera, Overlays, Vec3, Quat, Controller, print, getControllerWorldLocation */
 /* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
 //
 // audioMuteOverlay.js
diff --git a/scripts/system/audioScope.js b/scripts/system/audioScope.js
index 07efb17046..81d8e8fbd4 100644
--- a/scripts/system/audioScope.js
+++ b/scripts/system/audioScope.js
@@ -9,7 +9,7 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
-/* global Script, Tablets, AudioScope, Audio */
+/* global Script, Tablet, AudioScope, Audio */
 
 (function () { // BEGIN LOCAL_SCOPE
 
diff --git a/scripts/system/controllers/godView.js b/scripts/system/controllers/godView.js
index 9551c886c9..4b406399fd 100644
--- a/scripts/system/controllers/godView.js
+++ b/scripts/system/controllers/godView.js
@@ -9,7 +9,7 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
-/* globals HMD, Script, Menu, Tablets, Camera */
+/* globals HMD, Script, Menu, Tablet, Camera */
 /* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
 
 (function() { // BEGIN LOCAL_SCOPE
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index c4a8f0f54f..2bbd422c65 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -11,7 +11,7 @@
 //
 
 /* global Script, SelectionDisplay, LightOverlayManager, CameraManager, Grid, GridTool, EntityListTool, Vec3, SelectionManager, Overlays, OverlayWebWindow, UserActivityLogger,
-   Settings, Entities, Tablets, Toolbars, Messages, Menu, Camera, progressDialog, tooltip, MyAvatar, Quat, Controller, Clipboard, HMD, UndoStack, ParticleExplorerTool */
+   Settings, Entities, Tablet, Toolbars, Messages, Menu, Camera, progressDialog, tooltip, MyAvatar, Quat, Controller, Clipboard, HMD, UndoStack, ParticleExplorerTool */
 
 (function() { // BEGIN LOCAL_SCOPE
 
diff --git a/scripts/system/fingerPaint.js b/scripts/system/fingerPaint.js
index 06403b77b7..88245503e8 100644
--- a/scripts/system/fingerPaint.js
+++ b/scripts/system/fingerPaint.js
@@ -419,7 +419,7 @@
             return;
         }
 
-        // Tablets button.
+        // Tablet button.
         button = tablet.addButton({
             icon: "icons/tablet-icons/finger-paint-i.svg",
             activeIcon: "icons/tablet-icons/finger-paint-a.svg",
diff --git a/scripts/system/generalSettings.js b/scripts/system/generalSettings.js
index 0e917d6ae4..082528ffc5 100644
--- a/scripts/system/generalSettings.js
+++ b/scripts/system/generalSettings.js
@@ -10,7 +10,7 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
-/* globals Tablets, Toolbars, Script, HMD, DialogsManager */
+/* globals Tablet, Toolbars, Script, HMD, DialogsManager */
 
 (function() { // BEGIN LOCAL_SCOPE
 
diff --git a/scripts/system/goto.js b/scripts/system/goto.js
index f301af60bd..d364bf579e 100644
--- a/scripts/system/goto.js
+++ b/scripts/system/goto.js
@@ -10,7 +10,7 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
-/* globals Tablets, Toolbars, Script, HMD, DialogsManager */
+/* globals Tablet, Toolbars, Script, HMD, DialogsManager */
 
 (function() { // BEGIN LOCAL_SCOPE
 
diff --git a/scripts/system/help.js b/scripts/system/help.js
index cf0cd3c003..9ab7fa3fb3 100644
--- a/scripts/system/help.js
+++ b/scripts/system/help.js
@@ -10,7 +10,7 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
-/* globals Tablets, Script, HMD, Controller, Menu */
+/* globals Tablet, Script, HMD, Controller, Menu */
 
 (function() { // BEGIN LOCAL_SCOPE
     
diff --git a/scripts/system/hmd.js b/scripts/system/hmd.js
index e4f6455876..b9fd7f725c 100644
--- a/scripts/system/hmd.js
+++ b/scripts/system/hmd.js
@@ -10,7 +10,7 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
-/* globals HMD, Script, Menu, Tablets, Camera */
+/* globals HMD, Script, Menu, Tablet, Camera */
 /* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
 
 (function() { // BEGIN LOCAL_SCOPE
diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js
index 0fb4258f68..c46cfaa073 100644
--- a/scripts/system/libraries/WebTablet.js
+++ b/scripts/system/libraries/WebTablet.js
@@ -7,7 +7,7 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
-/* global getControllerWorldLocation, Tablets, WebTablet:true, HMD, Settings, Script,
+/* global getControllerWorldLocation, Tablet, WebTablet:true, HMD, Settings, Script,
    Vec3, Quat, MyAvatar, Entities, Overlays, Camera, Messages, Xform, clamp, Controller, Mat4, resizeTablet */
 
 Script.include(Script.resolvePath("../libraries/utils.js"));
diff --git a/scripts/system/libraries/entityList.js b/scripts/system/libraries/entityList.js
index 70e0645757..9d9689000e 100644
--- a/scripts/system/libraries/entityList.js
+++ b/scripts/system/libraries/entityList.js
@@ -8,7 +8,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-/* global EntityListTool, Tablets, selectionManager, Entities, Camera, MyAvatar, Vec3, Menu, Messages,
+/* global EntityListTool, Tablet, selectionManager, Entities, Camera, MyAvatar, Vec3, Menu, Messages,
    cameraManager, MENU_EASE_ON_FOCUS, deleteSelectedEntities, toggleSelectedEntitiesLocked, toggleSelectedEntitiesVisible */
 
 EntityListTool = function(opts) {
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index 750194bed2..4f2e47ee07 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -8,7 +8,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-/* global Tablets, Script, HMD, UserActivityLogger, Entities */
+/* global Tablet, Script, HMD, UserActivityLogger, Entities */
 /* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
 
 (function () { // BEGIN LOCAL_SCOPE
diff --git a/scripts/system/notifications.js b/scripts/system/notifications.js
index e1741cfa3b..b6ddd9d33e 100644
--- a/scripts/system/notifications.js
+++ b/scripts/system/notifications.js
@@ -1,6 +1,6 @@
 "use strict";
 /*jslint vars:true, plusplus:true, forin:true*/
-/*global Script, Settings, Window, Controller, Overlays, SoundArray, LODManager, MyAvatar, Tablets, Camera, HMD, Menu, Quat, Vec3*/
+/*global Script, Settings, Window, Controller, Overlays, SoundArray, LODManager, MyAvatar, Tablet, Camera, HMD, Menu, Quat, Vec3*/
 //
 //  notifications.js
 //  Version 0.801
diff --git a/scripts/system/pal.js b/scripts/system/pal.js
index bd318193cf..ed7059f9f3 100644
--- a/scripts/system/pal.js
+++ b/scripts/system/pal.js
@@ -1,6 +1,6 @@
 "use strict";
 /*jslint vars:true, plusplus:true, forin:true*/
-/*global Tablets, Settings, Script, AvatarList, Users, Entities, MyAvatar, Camera, Overlays, Vec3, Quat, HMD, Controller, Account, UserActivityLogger, Messages, Window, XMLHttpRequest, print, location, getControllerWorldLocation*/
+/*global Tablet, Settings, Script, AvatarList, Users, Entities, MyAvatar, Camera, Overlays, Vec3, Quat, HMD, Controller, Account, UserActivityLogger, Messages, Window, XMLHttpRequest, print, location, getControllerWorldLocation*/
 /* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
 //
 // pal.js
diff --git a/scripts/system/snapshot.js b/scripts/system/snapshot.js
index a14e1f2772..9afdb4ec53 100644
--- a/scripts/system/snapshot.js
+++ b/scripts/system/snapshot.js
@@ -7,7 +7,7 @@
 // Distributed under the Apache License, Version 2.0
 // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
-/* globals Tablets, Script, HMD, Settings, DialogsManager, Menu, Reticle, OverlayWebWindow, Desktop, Account, MyAvatar, Snapshot */
+/* globals Tablet, Script, HMD, Settings, DialogsManager, Menu, Reticle, OverlayWebWindow, Desktop, Account, MyAvatar, Snapshot */
 /* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
 
 (function () { // BEGIN LOCAL_SCOPE
diff --git a/scripts/system/tablet-goto.js b/scripts/system/tablet-goto.js
index 8347fcff9a..2a0e827932 100644
--- a/scripts/system/tablet-goto.js
+++ b/scripts/system/tablet-goto.js
@@ -1,6 +1,6 @@
 "use strict";
 /*jslint vars:true, plusplus:true, forin:true*/
-/*global Window, Script, Tablets, HMD, Controller, Account, XMLHttpRequest, location, print*/
+/*global Window, Script, Tablet, HMD, Controller, Account, XMLHttpRequest, location, print*/
 
 //
 //  goto.js
diff --git a/scripts/system/tablet-ui/tabletUI.js b/scripts/system/tablet-ui/tabletUI.js
index 0032239867..17821c737e 100644
--- a/scripts/system/tablet-ui/tabletUI.js
+++ b/scripts/system/tablet-ui/tabletUI.js
@@ -12,7 +12,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-/* global Script, HMD, WebTablet, UIWebTablet, UserActivityLogger, Settings, Entities, Messages, Tablets, Overlays,
+/* global Script, HMD, WebTablet, UIWebTablet, UserActivityLogger, Settings, Entities, Messages, Tablet, Overlays,
    MyAvatar, Menu, AvatarInputs, Vec3 */
 
 (function() { // BEGIN LOCAL_SCOPE
diff --git a/scripts/tutorials/createFloatingLanternBox.js b/scripts/tutorials/createFloatingLanternBox.js
index c83535fa37..c84214e295 100644
--- a/scripts/tutorials/createFloatingLanternBox.js
+++ b/scripts/tutorials/createFloatingLanternBox.js
@@ -1,6 +1,6 @@
 "use strict";
 /* jslint vars: true, plusplus: true, forin: true*/
-/* globals Tablets, Script, AvatarList, Users, Entities, MyAvatar, Camera, Overlays, Vec3, Quat, Controller, print, getControllerWorldLocation */
+/* globals Tablet, Script, AvatarList, Users, Entities, MyAvatar, Camera, Overlays, Vec3, Quat, Controller, print, getControllerWorldLocation */
 /* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
 //
 // createFloatinLanternBox.js
diff --git a/scripts/tutorials/createTetherballStick.js b/scripts/tutorials/createTetherballStick.js
index 3ad0939c2e..35f5fb0344 100644
--- a/scripts/tutorials/createTetherballStick.js
+++ b/scripts/tutorials/createTetherballStick.js
@@ -1,6 +1,6 @@
 "use strict";
 /* jslint vars: true, plusplus: true, forin: true*/
-/* globals Tablets, Script, AvatarList, Users, Entities, MyAvatar, Camera, Overlays, Vec3, Quat, Controller, print, getControllerWorldLocation */
+/* globals Tablet, Script, AvatarList, Users, Entities, MyAvatar, Camera, Overlays, Vec3, Quat, Controller, print, getControllerWorldLocation */
 /* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
 //
 // createTetherballStick.js
diff --git a/scripts/tutorials/entity_scripts/floatingLantern.js b/scripts/tutorials/entity_scripts/floatingLantern.js
index c2a79c9c5b..aa25dc0003 100644
--- a/scripts/tutorials/entity_scripts/floatingLantern.js
+++ b/scripts/tutorials/entity_scripts/floatingLantern.js
@@ -1,6 +1,6 @@
 "use strict";
 /* jslint vars: true, plusplus: true, forin: true*/
-/* globals Tablets, Script, AvatarList, Users, Entities, MyAvatar, Camera, Overlays, Vec3, Quat, Controller, print, getControllerWorldLocation */
+/* globals Tablet, Script, AvatarList, Users, Entities, MyAvatar, Camera, Overlays, Vec3, Quat, Controller, print, getControllerWorldLocation */
 /* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
 //
 // floatinLantern.js
diff --git a/scripts/tutorials/entity_scripts/floatingLanternBox.js b/scripts/tutorials/entity_scripts/floatingLanternBox.js
index b8e0fbda3e..b5fb0c27d9 100644
--- a/scripts/tutorials/entity_scripts/floatingLanternBox.js
+++ b/scripts/tutorials/entity_scripts/floatingLanternBox.js
@@ -1,6 +1,6 @@
 "use strict";
 /* jslint vars: true, plusplus: true, forin: true*/
-/* globals Tablets, Script, AvatarList, Users, Entities, MyAvatar, Camera, Overlays, Vec3, Quat, Controller, print, getControllerWorldLocation */
+/* globals Tablet, Script, AvatarList, Users, Entities, MyAvatar, Camera, Overlays, Vec3, Quat, Controller, print, getControllerWorldLocation */
 /* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
 //
 // floatingLanternBox.js
diff --git a/scripts/tutorials/entity_scripts/tetherballStick.js b/scripts/tutorials/entity_scripts/tetherballStick.js
index 50bac88caf..867074abd4 100644
--- a/scripts/tutorials/entity_scripts/tetherballStick.js
+++ b/scripts/tutorials/entity_scripts/tetherballStick.js
@@ -1,6 +1,6 @@
 "use strict";
 /* jslint vars: true, plusplus: true, forin: true*/
-/* globals Tablets, Script, AvatarList, Users, Entities, MyAvatar, Camera, Overlays, Vec3, Quat, Controller, print, getControllerWorldLocation */
+/* globals Tablet, Script, AvatarList, Users, Entities, MyAvatar, Camera, Overlays, Vec3, Quat, Controller, print, getControllerWorldLocation */
 /* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
 //
 // tetherballStick.js
diff --git a/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js b/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js
index 27c4eaef7b..76044d2975 100644
--- a/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js
+++ b/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js
@@ -1,6 +1,6 @@
 "use strict";
 /*jslint vars:true, plusplus:true, forin:true*/
-/*global Tablets, Script,  */
+/*global Tablet, Script,  */
 /* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
 //
 // spectatorCamera.js