diff --git a/guacamole/src/main/webapp/app/client/controllers/clientController.js b/guacamole/src/main/webapp/app/client/controllers/clientController.js
index db85dd52d..cba2cc910 100644
--- a/guacamole/src/main/webapp/app/client/controllers/clientController.js
+++ b/guacamole/src/main/webapp/app/client/controllers/clientController.js
@@ -244,7 +244,7 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
     });
 
     // Handle reconnect action
-    $scope.$on('guacStatusAction', function actionListener(event, action) {
+    $scope.$on('guacAction', function actionListener(event, action) {
 
         if (action === "client.action.reconnect")
             $scope.id = uniqueId;
diff --git a/guacamole/src/main/webapp/app/client/services/guacClientFactory.js b/guacamole/src/main/webapp/app/client/services/guacClientFactory.js
index e93e457a9..f5bd50c12 100644
--- a/guacamole/src/main/webapp/app/client/services/guacClientFactory.js
+++ b/guacamole/src/main/webapp/app/client/services/guacClientFactory.js
@@ -140,20 +140,20 @@ angular.module('client').factory('guacClientFactory', ['$rootScope',
             $scope.safeApply(function() {
 
                 // Begin file download
-                var guacFileStartEvent = $scope.$emit('guacFileStart', guacClient, stream.index, mimetype, filename);
+                var guacFileStartEvent = $scope.$emit('guacClientFileStart', guacClient, stream.index, mimetype, filename);
                 if (!guacFileStartEvent.defaultPrevented) {
 
                     var blob_reader = new Guacamole.BlobReader(stream, mimetype);
 
                     // Update progress as data is received
                     blob_reader.onprogress = function onprogress() {
-                        $scope.$emit('guacFileProgress', guacClient, stream.index, mimetype, filename);
+                        $scope.$emit('guacClientFileProgress', guacClient, stream.index, mimetype, filename);
                         stream.sendAck("Received", Guacamole.Status.Code.SUCCESS);
                     };
 
                     // When complete, prompt for download
                     blob_reader.onend = function onend() {
-                        $scope.$emit('guacFileEnd', guacClient, stream.index, mimetype, filename);
+                        $scope.$emit('guacClientFileEnd', guacClient, stream.index, mimetype, filename);
                     };
 
                     stream.sendAck("Ready", Guacamole.Status.Code.SUCCESS);
diff --git a/guacamole/src/main/webapp/app/index/controllers/statusController.js b/guacamole/src/main/webapp/app/index/controllers/statusController.js
index 9a45b5e25..158e38e6e 100644
--- a/guacamole/src/main/webapp/app/index/controllers/statusController.js
+++ b/guacamole/src/main/webapp/app/index/controllers/statusController.js
@@ -40,7 +40,7 @@ angular.module('manage').controller('statusController', ['$scope', '$rootScope',
         statusModal.showStatus(false);
 
         // Fire action event
-        $rootScope.$broadcast('guacStatusAction', action);
+        $rootScope.$broadcast('guacAction', action);
 
     };