diff --git a/MVMCoreUI/BaseClasses/TextView.swift b/MVMCoreUI/BaseClasses/TextView.swift
index 9136424f..6d3a3d7f 100644
--- a/MVMCoreUI/BaseClasses/TextView.swift
+++ b/MVMCoreUI/BaseClasses/TextView.swift
@@ -280,7 +280,7 @@ import UIKit
     
     open func originalUI() {
         
-        isEditable = textViewModel?.isEditable ?? true
+        isEditable = textViewModel?.editable ?? true
         isUserInteractionEnabled = true
         hideBorders = textViewModel?.hideBorders ?? false
         borderStrokeColor = .mvmCoolGray3
@@ -290,7 +290,7 @@ import UIKit
     
     open func errorUI() {
         
-        isEditable = textViewModel?.isEditable ?? true
+        isEditable = textViewModel?.editable ?? true
         isUserInteractionEnabled = true
         hideBorders = textViewModel?.hideBorders ?? false
         borderStrokeColor = .mvmOrange
@@ -300,7 +300,7 @@ import UIKit
     
     open func selectedErrorUI() {
         
-        isEditable = textViewModel?.isEditable ?? true
+        isEditable = textViewModel?.editable ?? true
         isUserInteractionEnabled = true
         hideBorders = textViewModel?.hideBorders ?? false
         borderStrokeColor = .mvmBlack
@@ -310,7 +310,7 @@ import UIKit
     
     open func selectedUI() {
         
-        isEditable = textViewModel?.isEditable ?? true
+        isEditable = textViewModel?.editable ?? true
         isUserInteractionEnabled = true
         hideBorders = textViewModel?.hideBorders ?? false
         borderStrokeColor = .mvmBlack
@@ -320,7 +320,7 @@ import UIKit
     
     open func disabledUI() {
         
-        isEditable = textViewModel?.isEditable ?? false
+        isEditable = textViewModel?.editable ?? false
         isUserInteractionEnabled = false
         hideBorders = textViewModel?.hideBorders ?? false
         borderStrokeColor = .mvmCoolGray3
@@ -437,7 +437,7 @@ extension TextView: MoleculeViewProtocol {
             heightConstraint?.isActive = true
         }
         
-        isEditable = model.isEditable
+        isEditable = model.editable
         textAlignment = model.textAlignment
         textColor = model.enabledTextColor.uiColor
         hideBorders = model.hideBorders
diff --git a/MVMCoreUI/BaseClasses/TextViewModel.swift b/MVMCoreUI/BaseClasses/TextViewModel.swift
index 3574d2b9..1972e60f 100644
--- a/MVMCoreUI/BaseClasses/TextViewModel.swift
+++ b/MVMCoreUI/BaseClasses/TextViewModel.swift
@@ -26,7 +26,7 @@ open class TextViewModel: TextEntryFieldModel {
     public var placeholderFontStyle: Styler.Font = Styler.Font.RegularMicro
     public var showsPlaceholder: Bool = false
     public var hideBorders: Bool = false
-    public var isEditable: Bool = true
+    public var editable: Bool = true
     
     //--------------------------------------------------
     // MARK: - Keys
@@ -41,7 +41,7 @@ open class TextViewModel: TextEntryFieldModel {
         case hideBorders
         case placeholderFontStyle
         case placeholderTextColor
-        case isEditable = "editable"
+        case editable
     }
     
     //--------------------------------------------------
@@ -68,8 +68,8 @@ open class TextViewModel: TextEntryFieldModel {
             self.hideBorders = hideBorders
         }
         
-        if let isEditable = try typeContainer.decodeIfPresent(Bool.self, forKey: .isEditable) {
-            self.isEditable = isEditable
+        if let editable = try typeContainer.decodeIfPresent(Bool.self, forKey: .editable) {
+            self.editable = editable
         }
         
         if let fontStyle = try typeContainer.decodeIfPresent(Styler.Font.self, forKey: .fontStyle) {
@@ -90,6 +90,6 @@ open class TextViewModel: TextEntryFieldModel {
         try container.encode(placeholderFontStyle, forKey: .placeholderFontStyle)
         try container.encode(placeholderTextColor, forKey: .placeholderTextColor)
         try container.encode(textAlignment, forKey: .textAlignment)
-        try container.encode(isEditable, forKey: .isEditable)
+        try container.encode(editable, forKey: .editable)
     }
 }