diff --git a/source/Ox.UI/js/Form/ArrayEditable.js b/source/Ox.UI/js/Form/ArrayEditable.js
index 00a0f5aa..ae27cc90 100644
--- a/source/Ox.UI/js/Form/ArrayEditable.js
+++ b/source/Ox.UI/js/Form/ArrayEditable.js
@@ -12,8 +12,8 @@ Ox.ArrayEditable <f> Array Editable
         edit <!> edit
         insert <!> insert
         open <!> open
-        selectafter <!> selectafter
-        selectbefore <!> selectbefore
+        selectnext <!> selectnext
+        selectprevious <!> selectprevious
         selectnone <!> selectnone
         select <!> select
         submit <!> submit
@@ -239,7 +239,7 @@ Ox.ArrayEditable = function(options, self) {
         if (self.selected > -1) {
             self.selected > 0
                 ? selectItem(0)
-                : that.triggerEvent('selectbefore');
+                : that.triggerEvent('selectprevious');
         }
     }
 
@@ -264,7 +264,7 @@ Ox.ArrayEditable = function(options, self) {
         if (self.selected > -1) {
             self.selected < self.options.items.length - 1
                 ? selectItem(self.options.items.length - 1)
-                : that.triggerEvent('selectafter');
+                : that.triggerEvent('selectnext');
         }
     }
 
@@ -272,7 +272,7 @@ Ox.ArrayEditable = function(options, self) {
         if (self.selected > -1) {
             self.selected < self.options.items.length - 1
                 ? selectItem(self.selected + 1)
-                : that.triggerEvent('selectafter');
+                : that.triggerEvent('selectnext');
         }
     }
 
@@ -284,7 +284,7 @@ Ox.ArrayEditable = function(options, self) {
         if (self.selected > -1) {
             self.selected > 0
                 ? selectItem(self.selected - 1)
-                : that.triggerEvent('selectbefore');
+                : that.triggerEvent('selectprevious');
         }
     }
 
diff --git a/source/Ox.UI/js/List/List.js b/source/Ox.UI/js/List/List.js
index dd0f3061..6490d4d2 100644
--- a/source/Ox.UI/js/List/List.js
+++ b/source/Ox.UI/js/List/List.js
@@ -50,8 +50,8 @@ Ox.List <f> List constructor
         openpreview <!> preview of selected item opened
         closepreview <!> preview closed
         select <!> select item
-        selectafter <!> selectafter
-        selectbefore <!> selectbefore
+        selectnext <!> selectnext
+        selectprevious <!> selectprevious
         toggle <!> toggle
 @*/
 
@@ -1178,7 +1178,7 @@ Ox.List = function(options, self) {
             select(pos);
             scrollToPosition(pos);
         } else if (self.selected.length) {
-            that.triggerEvent('selectafter');
+            that.triggerEvent('selectnext');
         }
     }
 
@@ -1192,7 +1192,7 @@ Ox.List = function(options, self) {
             select(pos);
             scrollToPosition(pos);
         } else if (self.selected.length) {
-            that.triggerEvent('selectbefore');
+            that.triggerEvent('selectprevious');
         }
     }
 
diff --git a/source/Ox.UI/js/Video/AnnotationFolder.js b/source/Ox.UI/js/Video/AnnotationFolder.js
index b190deb1..2d25a513 100644
--- a/source/Ox.UI/js/Video/AnnotationFolder.js
+++ b/source/Ox.UI/js/Video/AnnotationFolder.js
@@ -20,8 +20,8 @@ Ox.AnnotationFolder <f> AnnotationFolder Object
         key_* <!> key_*
         open <!> open
         remove <!> remove
-        selectafter <!> selectafter
-        selectbefore <!> selectbefore
+        selectnext <!> selectnext
+        selectprevious <!> selectprevious
         selectnone <!> selectnone
         select <!> select
         submit <!> submit
@@ -307,11 +307,11 @@ Ox.AnnotationFolder = function(options, self) {
                 that.triggerEvent('open');
             },
             select: selectAnnotation,
-            selectafter: function() {
-                that.triggerEvent('selectafter');
+            selectnext: function() {
+                that.triggerEvent('selectnext');
             },
-            selectbefore: function() {
-                that.triggerEvent('selectbefore');
+            selectprevious: function() {
+                that.triggerEvent('selectprevious');
             },
             selectnone: function() {
                 that.triggerEvent('selectnone');
@@ -652,7 +652,7 @@ Ox.AnnotationFolder = function(options, self) {
             self.$annotations.gainFocus();
         } else {
             that.triggerEvent(
-                position == 0 ? 'selectafter' : 'selectbefore'
+                position == 0 ? 'selectnext' : 'selectprevious'
             );
         }
     };
diff --git a/source/Ox.UI/js/Video/AnnotationPanel.js b/source/Ox.UI/js/Video/AnnotationPanel.js
index ccae218c..cd868931 100644
--- a/source/Ox.UI/js/Video/AnnotationPanel.js
+++ b/source/Ox.UI/js/Video/AnnotationPanel.js
@@ -340,10 +340,10 @@ Ox.AnnotationPanel = function(options, self) {
                 select: function(data) {
                     selectAnnotation(data, index);
                 },
-                selectafter: function() {
+                selectnext: function() {
                     selectNext(layer.id, 1);
                 },
-                selectbefore: function() {
+                selectprevious: function() {
                     selectNext(layer.id, -1);
                 },
                 selectnone: selectNone,