diff --git a/guacamole/src/main/frontend/src/app/index/filters/resolveFilter.js b/guacamole/src/main/frontend/src/app/index/filters/resolveFilter.js
index ccf8ad749..a774d28fb 100644
--- a/guacamole/src/main/frontend/src/app/index/filters/resolveFilter.js
+++ b/guacamole/src/main/frontend/src/app/index/filters/resolveFilter.js
@@ -29,7 +29,7 @@ angular.module('index').filter('resolve', [function resolveFilter() {
      *
      * @type {!string}
      */
-    var RESOLVED_VALUE_KEY = '_guac_resolveFilter_resolvedValue';
+    const RESOLVED_VALUE_KEY = '_guac_resolveFilter_resolvedValue';
 
     return function resolveFilter(promise) {
 
diff --git a/guacamole/src/main/frontend/src/app/player/directives/player.js b/guacamole/src/main/frontend/src/app/player/directives/player.js
index 78e8adc5a..7b3e08792 100644
--- a/guacamole/src/main/frontend/src/app/player/directives/player.js
+++ b/guacamole/src/main/frontend/src/app/player/directives/player.js
@@ -77,7 +77,7 @@
  */
 angular.module('player').directive('guacPlayer', ['$injector', function guacPlayer($injector) {
 
-    var config = {
+    const config = {
         restrict : 'E',
         templateUrl : 'app/player/templates/player.html'
     };
@@ -172,7 +172,7 @@ angular.module('player').directive('guacPlayer', ['$injector', function guacPlay
          *     The decimal string representation of the given value, padded
          *     with leading zeroes up to a minimum length of two digits.
          */
-        var zeroPad = function zeroPad(value) {
+        const zeroPad = function zeroPad(value) {
             return value > 9 ? value : '0' + value;
         };
 
diff --git a/guacamole/src/main/frontend/src/app/player/directives/playerDisplay.js b/guacamole/src/main/frontend/src/app/player/directives/playerDisplay.js
index 20eab7cb8..114566a93 100644
--- a/guacamole/src/main/frontend/src/app/player/directives/playerDisplay.js
+++ b/guacamole/src/main/frontend/src/app/player/directives/playerDisplay.js
@@ -50,7 +50,7 @@
  */
 angular.module('player').directive('guacPlayerDisplay', [function guacPlayerDisplay() {
 
-    var config = {
+    const config = {
         restrict : 'E',
         templateUrl : 'app/player/templates/playerDisplay.html'
     };
@@ -75,7 +75,7 @@ angular.module('player').directive('guacPlayerDisplay', [function guacPlayerDisp
          *
          * @type {Element}
          */
-        var element = $element.find('.guac-player-display')[0];
+        const element = $element.find('.guac-player-display')[0];
 
         /**
          * The element which serves as a container for the root element of the
@@ -83,7 +83,7 @@ angular.module('player').directive('guacPlayerDisplay', [function guacPlayerDisp
          *
          * @type {HTMLDivElement}
          */
-        var container = $element.find('.guac-player-display-container')[0];
+        const container = $element.find('.guac-player-display-container')[0];
 
         /**
          * Rescales the Guacamole.Display currently assigned to $scope.display
diff --git a/guacamole/src/main/frontend/src/app/player/directives/progressIndicator.js b/guacamole/src/main/frontend/src/app/player/directives/progressIndicator.js
index 1d20fc065..8a793fa7d 100644
--- a/guacamole/src/main/frontend/src/app/player/directives/progressIndicator.js
+++ b/guacamole/src/main/frontend/src/app/player/directives/progressIndicator.js
@@ -50,7 +50,7 @@
  */
 angular.module('player').directive('guacPlayerProgressIndicator', [function guacPlayerProgressIndicator() {
 
-    var config = {
+    const config = {
         restrict : 'E',
         templateUrl : 'app/player/templates/progressIndicator.html'
     };
diff --git a/guacamole/src/main/frontend/src/app/settings/controllers/connectionHistoryPlayerController.js b/guacamole/src/main/frontend/src/app/settings/controllers/connectionHistoryPlayerController.js
index 7adb64cff..b40f5f93a 100644
--- a/guacamole/src/main/frontend/src/app/settings/controllers/connectionHistoryPlayerController.js
+++ b/guacamole/src/main/frontend/src/app/settings/controllers/connectionHistoryPlayerController.js
@@ -24,8 +24,8 @@ angular.module('manage').controller('connectionHistoryPlayerController', ['$scop
         function connectionHistoryPlayerController($scope, $injector) {
 
     // Required services
-    var authenticationService = $injector.get('authenticationService');
-    var $routeParams          = $injector.get('$routeParams');
+    const authenticationService = $injector.get('authenticationService');
+    const $routeParams          = $injector.get('$routeParams');
 
     /**
      * The URL of the REST API resource exposing the requested session
@@ -33,7 +33,7 @@ angular.module('manage').controller('connectionHistoryPlayerController', ['$scop
      *
      * @type {!string}
      */
-    var recordingURL = 'api/session/data/' + encodeURIComponent($routeParams.dataSource)
+    const recordingURL = 'api/session/data/' + encodeURIComponent($routeParams.dataSource)
             + '/history/connections/' + encodeURIComponent($routeParams.identifier)
             + '/logs/' + encodeURIComponent($routeParams.name);
 
diff --git a/guacamole/src/main/frontend/src/app/settings/types/ConnectionHistoryEntryWrapper.js b/guacamole/src/main/frontend/src/app/settings/types/ConnectionHistoryEntryWrapper.js
index 9015ea0be..e7db412d8 100644
--- a/guacamole/src/main/frontend/src/app/settings/types/ConnectionHistoryEntryWrapper.js
+++ b/guacamole/src/main/frontend/src/app/settings/types/ConnectionHistoryEntryWrapper.js
@@ -24,11 +24,11 @@ angular.module('settings').factory('ConnectionHistoryEntryWrapper', ['$injector'
     function defineConnectionHistoryEntryWrapper($injector) {
 
     // Required types
-    var ActivityLog            = $injector.get('ActivityLog');
-    var ConnectionHistoryEntry = $injector.get('ConnectionHistoryEntry');
+    const ActivityLog            = $injector.get('ActivityLog');
+    const ConnectionHistoryEntry = $injector.get('ConnectionHistoryEntry');
 
     // Required services
-    var $translate = $injector.get('$translate');
+    const $translate = $injector.get('$translate');
 
     /**
      * Wrapper for ConnectionHistoryEntry which adds display-specific
@@ -38,7 +38,7 @@ angular.module('settings').factory('ConnectionHistoryEntryWrapper', ['$injector'
      * @param {ConnectionHistoryEntry} historyEntry
      *     The ConnectionHistoryEntry that should be wrapped.
      */
-    var ConnectionHistoryEntryWrapper = function ConnectionHistoryEntryWrapper(dataSource, historyEntry) {
+    const ConnectionHistoryEntryWrapper = function ConnectionHistoryEntryWrapper(dataSource, historyEntry) {
 
         /**
          * The wrapped ConnectionHistoryEntry.