diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezemail.js b/src/bundle/Resources/public/js/scripts/fieldType/ezemail.js
index 78533f97a2..79e974c194 100644
--- a/src/bundle/Resources/public/js/scripts/fieldType/ezemail.js
+++ b/src/bundle/Resources/public/js/scripts/fieldType/ezemail.js
@@ -1,6 +1,6 @@
 (function(global, doc, eZ) {
-    const SELECTOR_FIELD = '.ez-field-edit--ezemail';
-    const SELECTOR_ERROR_NODE = '.ez-data-source';
+    const SELECTOR_FIELD = '.ibexa-field-edit--ezemail';
+    const SELECTOR_ERROR_NODE = '.ibexa-form-error';
 
     class EzEmailValidator extends eZ.BaseFieldValidator {
         /**
@@ -17,7 +17,7 @@
             const isEmpty = !input.value.trim();
             const isValid = eZ.errors.emailRegexp.test(input.value);
             const isError = (isRequired && isEmpty) || (!isEmpty && !isValid);
-            const label = input.closest(SELECTOR_FIELD).querySelector('.ez-field-edit__label').innerHTML;
+            const label = input.closest(SELECTOR_FIELD).querySelector('.ibexa-field-edit__label').innerHTML;
             const result = { isError };
 
             if (isRequired && isEmpty) {
@@ -35,7 +35,7 @@
         fieldSelector: SELECTOR_FIELD,
         eventsMap: [
             {
-                selector: '.ez-field-edit--ezemail input',
+                selector: '.ibexa-field-edit--ezemail input',
                 eventName: 'blur',
                 callback: 'validateInput',
                 errorNodeSelectors: [SELECTOR_ERROR_NODE],
diff --git a/src/bundle/Resources/public/scss/fieldType/edit/_ezemail.scss b/src/bundle/Resources/public/scss/fieldType/edit/_ezemail.scss
index f5105de876..fde2ef9c59 100644
--- a/src/bundle/Resources/public/scss/fieldType/edit/_ezemail.scss
+++ b/src/bundle/Resources/public/scss/fieldType/edit/_ezemail.scss
@@ -1,5 +1,5 @@
-.ez-field-edit--ezemail {
-    .ez-field-edit__data {
+.ibexa-field-edit--ezemail {
+    .ibexa-field-edit__data {
         width: 50%;
         max-width: calculateRem(500px);
     }