diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryField.swift
index 628c7cde..18f61b2d 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryField.swift
@@ -322,7 +322,7 @@ import UIKit
     @objc override open func resignFirstResponder() -> Bool {
         
         if validateWhenDoneEditing {
-            validateTextField()
+            validateText()
         }
         
         selectedDigitBox?.isSelected = false
@@ -440,7 +440,7 @@ extension DigitEntryField {
         selectedDigitBox = nil
         
         if !switchFieldsAutomatically && validateWhenDoneEditing {
-            validateTextField()
+            validateText()
         }
         
         proprietorTextDelegate?.textFieldDidEndEditing?(textField)
diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift
index 499fe5a8..41fec6bb 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift
@@ -236,6 +236,13 @@ import UIKit
     // MARK: - Validation
     //--------------------------------------------------
     
+    /// Validates the text of the entry field.
+    @objc public func validateText() {
+        if let isValid = FormValidator.validate(delegate: delegateObject?.formHolderDelegate) {
+            self.isValid = isValid
+        }
+    }
+    
     /// Executes on .textDidBeginEditingNotification
     @objc func startEditing() {
         isSelected = true
diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
index 63ba9e71..e849fc2f 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
@@ -223,7 +223,7 @@ import UIKit
     @discardableResult
     @objc override open func resignFirstResponder() -> Bool {
         if validateWhenDoneEditing {
-            validateTextField()
+            validateText()
         }
         textField.resignFirstResponder()
         isSelected = false
@@ -231,9 +231,9 @@ import UIKit
     }
     
     /// Validates the text of the entry field.
-    @objc public func validateTextField() {
+    @objc public override func validateText() {
         text = textField.text
-        _ = FormValidator.validate(delegate: delegateObject?.formHolderDelegate)
+        super.validateText()
     }
     
     @objc public func updateValidation(_ isValid: Bool) {
@@ -266,7 +266,7 @@ import UIKit
     /// Executes on UITextField.textDidChangeNotification (each character entry)
     @objc override func valueChanged() {
         super.valueChanged()
-        validateTextField()
+        validateText()
     }
     
     /// Executes on UITextField.textDidEndEditingNotification
diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift
index cb8e2cae..e08f3843 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift
@@ -183,11 +183,9 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
     //--------------------------------------------------
     
     /// Validates the text of the entry field.
-    @objc public func validateTextView() {
+    @objc public override func validateText() {
         text = textView.text
-        if let isValid = FormValidator.validate(delegate: delegateObject?.formHolderDelegate) {
-            self.isValid = isValid
-        }
+        super.validateText()
     }
     
     /// Executes on UITextView.textDidBeginEditingNotification
@@ -199,7 +197,7 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
     /// Executes on UITextView.textDidChangeNotification (each character entry)
     @objc override func valueChanged() {
         super.valueChanged()
-        validateTextView()
+        validateText()
     }
     
     /// Executes on UITextView.textDidEndEditingNotification