diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
index 21980be925..a6a5336af0 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/events/events.directive.js
@@ -3,54 +3,6 @@
 **/
 angular.module('umbraco.directives')
 
-.directive('onKeyup', function () {
-    return {
-        link: function (scope, elm, attrs) {
-            var f = function () {
-                scope.$apply(attrs.onKeyup);
-            };
-            elm.on("keyup", f);
-            scope.$on("$destroy", function(){ elm.off("keyup", f);} );
-        }
-    };
-})
-
-.directive('onKeydown', function () {
-    return {
-        link: function (scope, elm, attrs) {
-            var f = function () {
-                scope.$apply(attrs.onKeydown);
-            };
-            elm.on("keydown", f);
-            scope.$on("$destroy", function(){ elm.off("keydown", f);} );
-        }
-    };
-})
-
-.directive('onBlur', function () {
-    return {
-        link: function (scope, elm, attrs) {
-            var f = function () {
-                scope.$apply(attrs.onBlur);
-            };
-            elm.on("blur", f);
-            scope.$on("$destroy", function(){ elm.off("blur", f);} );
-        }
-    };
-})
-
-.directive('onFocus', function () {
-    return {
-        link: function (scope, elm, attrs) {
-            var f = function () {
-                scope.$apply(attrs.onFocus);
-            };
-            elm.on("focus", f);
-            scope.$on("$destroy", function(){ elm.off("focus", f);} );
-        }
-    };
-})
-
 .directive('onDragEnter', function () {
     return {
         link: function (scope, elm, attrs) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
index f6a641f2af..f14fb364ab 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/embed/embed.html
@@ -32,11 +32,11 @@
                 
                         <div ng-show="model.embed.supportsDimensions">
                             <umb-control-group label="@general_width">
-                                <input type="number" pattern="[0-9]*" min="0" ng-model="model.embed.width" on-blur="vm.changeSize('width')" />
+                                <input type="number" pattern="[0-9]*" min="0" ng-model="model.embed.width" ng-blur="vm.changeSize('width')" />
                             </umb-control-group>
                 
                             <umb-control-group label="@general_height">
-                                <input type="number" pattern="[0-9]*" min="0" ng-model="model.embed.height" on-blur="vm.changeSize('height')" />
+                                <input type="number" pattern="[0-9]*" min="0" ng-model="model.embed.height" ng-blur="vm.changeSize('height')" />
                             </umb-control-group>
                 
                             <umb-control-group label="@general_constrain">
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
index 73a073b731..3bb694cac6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
@@ -69,7 +69,7 @@
                             </a>
     
                             <input type="text" class="umb-breadcrumbs__add-ancestor" ng-show="showFolderInput" ng-model="model.newFolderName" ng-keydown="enterSubmitFolder($event)"
-                                on-blur="submitFolder()" focus-when="{{showFolderInput}}" />
+                                ng-blur="submitFolder()" focus-when="{{showFolderInput}}" />
                         </li>
                     </ul>
                     <div class="umb-loader" ng-if="creatingFolder"></div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
index 31ea24b581..c0490a1707 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
@@ -65,7 +65,7 @@
                                    ng-disabled="tab.inherited"
                                    umb-auto-focus
                                    umb-auto-resize
-                                   on-focus="activateGroup(tab)"
+                                   ng-focus="activateGroup(tab)"
                                    required
                                    val-server-field="{{'Groups[' + $index + '].Name'}}" />
 
@@ -87,7 +87,7 @@
 
                     <ng-form name="groupSortOrderForm" class="umb-group-builder__group-sort-order">
                         <div ng-if="sortingMode">
-                            <input name="groupSortOrder" type="number" class="umb-property-editor-tiny" style="margin-bottom: 0;" ng-model="tab.sortOrder" ng-disabled="tab.inherited" on-blur="changeSortOrderValue(tab)" required />
+                            <input name="groupSortOrder" type="number" class="umb-property-editor-tiny" style="margin-bottom: 0;" ng-model="tab.sortOrder" ng-disabled="tab.inherited" ng-blur="changeSortOrderValue(tab)" required />
 
                             <!-- This is a manual validation message not bound to a validator -->
                             <div class="umb-validation-label -arrow-left" ng-if="groupSortOrderForm.groupSortOrder.$error.required && tab.showSortOrderMissing"><localize key="required"></localize></div>
@@ -121,7 +121,7 @@
                             hotkey="alt+shift+p"
                             hotkey-when="{{tab.tabState === 'active' && property.propertyState=='init'}}"
                             ng-click="addProperty(property, tab)"
-                            on-focus="activateGroup(tab)"
+                            ng-focus="activateGroup(tab)"
                             focus-when="{{property.focus}}">
                             <localize key="contentTypeEditor_addProperty"></localize>
                         </a>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-locked-field.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-locked-field.html
index 56c5be6fb2..d13474d221 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-locked-field.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-locked-field.html
@@ -24,7 +24,7 @@
                title="{{ngModel}}"
                focus-when="{{!locked}}"
                umb-select-when="{{!locked}}"
-               on-blur="lock()" />
+               ng-blur="lock()" />
 
     </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
index f1d46e951e..6fcdfafdcd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
@@ -26,7 +26,7 @@
               class="typeahead tags-{{model.alias}}"
               ng-model="$parent.tagToAdd"
               ng-keydown="$parent.addTagOnEnter($event)"
-              on-blur="$parent.addTag()"
+              ng-blur="$parent.addTag()"
               localize="placeholder"
               placeholder="@placeholders_enterTags" />