diff --git a/src/scripts/js/es6/common/vuecomponents/App.js b/src/scripts/js/es6/common/vuecomponents/App.js
index a432549f..372bf104 100644
--- a/src/scripts/js/es6/common/vuecomponents/App.js
+++ b/src/scripts/js/es6/common/vuecomponents/App.js
@@ -8,8 +8,8 @@ const TEMPLATE =`
         :projectId="projectId"
         :selectedIds="currentSelectedIds"
         :componentState="initialTableState"
-        @selectItemsChanged="onSelectItemsChanged"
-        @componentStateChanged="onTableStateChanged"
+        @selected-items-changed="onSelectItemsChanged"
+        @component-state-changed="onTableStateChanged"
     />
 </div>
 `;
diff --git a/src/scripts/js/es6/common/vuecomponents/jobstable/rows/filter/RowFilter.js b/src/scripts/js/es6/common/vuecomponents/jobstable/rows/filter/RowFilter.js
index 259f5699..a704f7a3 100644
--- a/src/scripts/js/es6/common/vuecomponents/jobstable/rows/filter/RowFilter.js
+++ b/src/scripts/js/es6/common/vuecomponents/jobstable/rows/filter/RowFilter.js
@@ -6,15 +6,15 @@ const TEMPLATE =`
     <name-filter 
         :rowObjects="rowObjects"
         :componentState="(componentState || {}).nameFilter"
-        @visibleRowObjectsChanged="onNameFiltered"
-        @componentStateChanged="onNameFilterStateChanged"
+        @visible-row-objects-changed="onNameFiltered"
+        @component-state-changed="onNameFilterStateChanged"
     />
     <status-filter
         :availableStatuses="availableStatuses"
         :rowObjects="nameFilteredRowObjects"
         :componentState="(componentState || {}).statusFilter"
-        @visibleRowObjectsChanged="$emit('visibleRowObjectsChanged', ...arguments)"
-        @componentStateChanged="onStatusFilterStateChanged"
+        @visible-row-objects-changed="$emit('visible-row-objects-changed', ...arguments)"
+        @component-state-changed="onStatusFilterStateChanged"
     />
 </div>
 `;
@@ -72,7 +72,7 @@ let RowFilter = {
     },
     watch: {
         currentComponentState(newValue) {
-            this.$emit('componentStateChanged', newValue);
+            this.$emit('component-state-changed', newValue);
         }
     },
     components: {