diff --git a/js/app/module_map.js b/js/app/module_map.js
index ba67d3ae..34b25688 100644
--- a/js/app/module_map.js
+++ b/js/app/module_map.js
@@ -223,8 +223,9 @@ define([
 
             if(currentSystemData){
                 if(systemData.id === currentSystemData.systemData.id){
-                    // trigger system update event
-                    $(document).trigger('pf:updateSystemModules', [systemData]);
+                    // trigger system update events
+                    $(document).triggerHandler('pf:updateSystemInfoModule', [systemData]);
+                    $(document).triggerHandler('pf:updateSystemSignatureModule', [systemData]);
                 }
             }
         }
diff --git a/js/app/ui/system_info.js b/js/app/ui/system_info.js
index cb003f98..354cbf70 100644
--- a/js/app/ui/system_info.js
+++ b/js/app/ui/system_info.js
@@ -50,7 +50,7 @@ define([
      * set module observer and look for relevant system data to update
      */
     var setModuleObserver = function(moduleElement){
-        $(document).on('pf:updateSystemModules', function(e, data){
+        $(document).off('pf:updateSystemInfoModule').on('pf:updateSystemInfoModule', function(e, data){
             if(data){
                 moduleElement.updateSystemInfoModule(data);
             }
diff --git a/js/app/ui/system_signature.js b/js/app/ui/system_signature.js
index 3e2279bc..751a4467 100644
--- a/js/app/ui/system_signature.js
+++ b/js/app/ui/system_signature.js
@@ -1775,7 +1775,7 @@ define([
         var dataTablePrimary = signatureTable.DataTable();
         var signatureTableApi = signatureTable.api();
 
-        $(document).off('pf:updateSystemModules').on('pf:updateSystemModules', function(e, data){
+        $(document).off('pf:updateSystemSignatureModule').on('pf:updateSystemSignatureModule', function(e, data){
             if(data.signatures){
                 moduleElement.updateSignatureTable(data.signatures, true);
             }
diff --git a/public/js/v1.1.5/app/module_map.js b/public/js/v1.1.5/app/module_map.js
index ba67d3ae..34b25688 100644
--- a/public/js/v1.1.5/app/module_map.js
+++ b/public/js/v1.1.5/app/module_map.js
@@ -223,8 +223,9 @@ define([
 
             if(currentSystemData){
                 if(systemData.id === currentSystemData.systemData.id){
-                    // trigger system update event
-                    $(document).trigger('pf:updateSystemModules', [systemData]);
+                    // trigger system update events
+                    $(document).triggerHandler('pf:updateSystemInfoModule', [systemData]);
+                    $(document).triggerHandler('pf:updateSystemSignatureModule', [systemData]);
                 }
             }
         }
diff --git a/public/js/v1.1.5/app/ui/system_info.js b/public/js/v1.1.5/app/ui/system_info.js
index cb003f98..354cbf70 100644
--- a/public/js/v1.1.5/app/ui/system_info.js
+++ b/public/js/v1.1.5/app/ui/system_info.js
@@ -50,7 +50,7 @@ define([
      * set module observer and look for relevant system data to update
      */
     var setModuleObserver = function(moduleElement){
-        $(document).on('pf:updateSystemModules', function(e, data){
+        $(document).off('pf:updateSystemInfoModule').on('pf:updateSystemInfoModule', function(e, data){
             if(data){
                 moduleElement.updateSystemInfoModule(data);
             }
diff --git a/public/js/v1.1.5/app/ui/system_signature.js b/public/js/v1.1.5/app/ui/system_signature.js
index 3e2279bc..751a4467 100644
--- a/public/js/v1.1.5/app/ui/system_signature.js
+++ b/public/js/v1.1.5/app/ui/system_signature.js
@@ -1775,7 +1775,7 @@ define([
         var dataTablePrimary = signatureTable.DataTable();
         var signatureTableApi = signatureTable.api();
 
-        $(document).off('pf:updateSystemModules').on('pf:updateSystemModules', function(e, data){
+        $(document).off('pf:updateSystemSignatureModule').on('pf:updateSystemSignatureModule', function(e, data){
             if(data.signatures){
                 moduleElement.updateSignatureTable(data.signatures, true);
             }