diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryFieldModel.swift
index 2f645552..8799f6aa 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryFieldModel.swift	
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/MultiItemDropdownEntryFieldModel.swift	
@@ -86,7 +86,6 @@ import Foundation
     //--------------------------------------------------
     
     private enum CodingKeys: String, CodingKey {
-        case moleculeName
         case components
         case selectedIndexes
         case delimiters
@@ -120,7 +119,6 @@ import Foundation
     public override func encode(to encoder: Encoder) throws {
         try super.encode(to: encoder)
         var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(components, forKey: .components)
         try container.encode(selectedIndexesArray, forKey: .selectedIndexes)
         try container.encodeIfPresent(delimiterArray, forKey: .delimiters)
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryFieldModel.swift
index 66b3d4bf..ca7543bd 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryFieldModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryFieldModel.swift
@@ -95,7 +95,6 @@
     //--------------------------------------------------
     
     private enum CodingKeys: String, CodingKey {
-        case moleculeName
         case placeholder
         case textAlignment
         case enabledTextColor
@@ -141,7 +140,6 @@
     public override func encode(to encoder: Encoder) throws {
         try super.encode(to: encoder)
         var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(moleculeName, forKey: .moleculeName)
         try container.encodeIfPresent(placeholder, forKey: .placeholder)
         try container.encodeIfPresent(textAlignment, forKey: .textAlignment)
         try container.encodeIfPresent(type, forKey: .type)
diff --git a/MVMCoreUI/Atomic/Molecules/Items/CarouselItemModel.swift b/MVMCoreUI/Atomic/Molecules/Items/CarouselItemModel.swift
index 018a93d6..19348070 100644
--- a/MVMCoreUI/Atomic/Molecules/Items/CarouselItemModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/Items/CarouselItemModel.swift
@@ -30,7 +30,6 @@ import Foundation
     //--------------------------------------------------
     
     private enum CodingKeys: String, CodingKey {
-        case moleculeName
         case peakingUI
         case peakingArrowColor
         case analyticsData
@@ -53,7 +52,6 @@ import Foundation
     open override func encode(to encoder: Encoder) throws {
         try super.encode(to: encoder)
         var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(moleculeName, forKey: .moleculeName)
         try container.encodeIfPresent(peakingUI, forKey: .peakingUI)
         try container.encodeIfPresent(peakingArrowColor, forKey: .peakingArrowColor)
         try container.encodeIfPresent(analyticsData, forKey: .analyticsData)
diff --git a/MVMCoreUI/Atomic/Molecules/OtherContainers/BGImageMoleculeModel.swift b/MVMCoreUI/Atomic/Molecules/OtherContainers/BGImageMoleculeModel.swift
index 467ae6ac..56b77e3e 100644
--- a/MVMCoreUI/Atomic/Molecules/OtherContainers/BGImageMoleculeModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/OtherContainers/BGImageMoleculeModel.swift
@@ -36,7 +36,6 @@ open class BGImageMoleculeModel: MoleculeContainerModel {
     }
 
     private enum CodingKeys: String, CodingKey {
-        case moleculeName
         case image
     }
 
@@ -54,7 +53,6 @@ open class BGImageMoleculeModel: MoleculeContainerModel {
     open override func encode(to encoder: Encoder) throws {
         try super.encode(to: encoder)
         var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(image, forKey: .image)
     }
 }
diff --git a/MVMCoreUI/Atomic/Protocols/ModelProtocols/MoleculeModelProtocol.swift b/MVMCoreUI/Atomic/Protocols/ModelProtocols/MoleculeModelProtocol.swift
index 4f0cd296..a998b79d 100644
--- a/MVMCoreUI/Atomic/Protocols/ModelProtocols/MoleculeModelProtocol.swift
+++ b/MVMCoreUI/Atomic/Protocols/ModelProtocols/MoleculeModelProtocol.swift
@@ -14,7 +14,7 @@ public protocol MoleculeModelProtocol: ModelProtocol, AccessibilityModelProtocol
 
 public extension MoleculeModelProtocol {
     
-    var moleculeName: String { Self.identifier }
+    var moleculeName: String { type(of: self).identifier }
     
     static var categoryName: String { "\(MoleculeModelProtocol.self)" }