diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj
index 410cf3c5..94de6eb8 100644
--- a/MVMCoreUI.xcodeproj/project.pbxproj
+++ b/MVMCoreUI.xcodeproj/project.pbxproj
@@ -60,7 +60,7 @@
 		01EB369423609801006832FA /* HeadlineBodyModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01EB368D23609801006832FA /* HeadlineBodyModel.swift */; };
 		01F2A03223A4498200D954D8 /* CaretLinkModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A03123A4498200D954D8 /* CaretLinkModel.swift */; };
 		0A1214A022C11A18007C7030 /* ActionDetailWithImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A12149F22C11A17007C7030 /* ActionDetailWithImage.swift */; };
-		0A1B4A96233BB18F005B3FB4 /* CheckboxWithLabelView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7BAFA2232BE63400FB8E22 /* CheckboxWithLabelView.swift */; };
+		0A1B4A96233BB18F005B3FB4 /* CheckboxLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7BAFA2232BE63400FB8E22 /* CheckboxLabel.swift */; };
 		0A21DB7F235DECC500C160A2 /* EntryField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A21DB7E235DECC500C160A2 /* EntryField.swift */; };
 		0A21DB83235DFBC500C160A2 /* MdnEntryField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A21DB82235DFBC500C160A2 /* MdnEntryField.swift */; };
 		0A21DB84235E06EF00C160A2 /* MFTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = D29DF24C21E6A177003B2FB9 /* MFTextField.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -387,7 +387,7 @@
 		0A6BF4712360C56C0028F841 /* BaseDropdownEntryField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseDropdownEntryField.swift; sourceTree = "<group>"; };
 		0A7BAD73232A8DC700FB8E22 /* HeadlineBodyButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadlineBodyButton.swift; sourceTree = "<group>"; };
 		0A7BAFA0232BE61800FB8E22 /* Checkbox.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Checkbox.swift; sourceTree = "<group>"; };
-		0A7BAFA2232BE63400FB8E22 /* CheckboxWithLabelView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckboxWithLabelView.swift; sourceTree = "<group>"; };
+		0A7BAFA2232BE63400FB8E22 /* CheckboxLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckboxLabel.swift; sourceTree = "<group>"; };
 		0A7EF85A23D8A52800B2AAD1 /* EntryFieldModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EntryFieldModel.swift; sourceTree = "<group>"; };
 		0A7EF85C23D8A95600B2AAD1 /* TextEntryFieldModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextEntryFieldModel.swift; sourceTree = "<group>"; };
 		0A7EF85E23D8ABC500B2AAD1 /* MdnEntryFieldModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MdnEntryFieldModel.swift; sourceTree = "<group>"; };
@@ -1176,7 +1176,7 @@
 				31BE15CA23D8924C00452370 /* CheckboxModel.swift */,
 				0A7BAFA0232BE61800FB8E22 /* Checkbox.swift */,
 				31BE15C923D8924C00452370 /* CheckboxLabelModel.swift */,
-				0A7BAFA2232BE63400FB8E22 /* CheckboxWithLabelView.swift */,
+				0A7BAFA2232BE63400FB8E22 /* CheckboxLabel.swift */,
 				01004F2F22721C3800991ECC /* RadioButton.swift */,
 				D28A838223CCBD3F00DFE4FC /* CircleProgressModel.swift */,
 				943784F3236B77BB006A1E82 /* GraphView.swift */,
@@ -1608,7 +1608,7 @@
 				D29DF13021E6851E003B2FB9 /* MVMCoreUITopAlertShortView.m in Sources */,
 				0ABD136D237CAD1E0081388D /* DateDropdownEntryField.swift in Sources */,
 				0A7EF85B23D8A52800B2AAD1 /* EntryFieldModel.swift in Sources */,
-				0A1B4A96233BB18F005B3FB4 /* CheckboxWithLabelView.swift in Sources */,
+				0A1B4A96233BB18F005B3FB4 /* CheckboxLabel.swift in Sources */,
 				0A21DB8B235E06EF00C160A2 /* MFDigitTextBox.m in Sources */,
 				D260D7B222D65BDD007E7233 /* MVMCoreUIPageControl.m in Sources */,
 				D2B18B812360945C00A9AEDC /* View.swift in Sources */,
diff --git a/MVMCoreUI/Atoms/Views/CheckboxWithLabelView.swift b/MVMCoreUI/Atoms/Views/CheckboxLabel.swift
similarity index 96%
rename from MVMCoreUI/Atoms/Views/CheckboxWithLabelView.swift
rename to MVMCoreUI/Atoms/Views/CheckboxLabel.swift
index bc23db73..700cbd4f 100644
--- a/MVMCoreUI/Atoms/Views/CheckboxWithLabelView.swift
+++ b/MVMCoreUI/Atoms/Views/CheckboxLabel.swift
@@ -1,5 +1,5 @@
 //
-//  CheckboxWithLabelView.swift
+//  CheckboxLabel.swift
 //  MVMCoreUI
 //
 //  Created by Kevin Christiano on 9/13/19.
@@ -7,7 +7,7 @@
 //
 
 
-@objcMembers open class CheckboxWithLabelView: View {
+@objcMembers open class CheckboxLabel: View {
     //--------------------------------------------------
     // MARK: - Outlets
     //--------------------------------------------------
@@ -86,7 +86,7 @@
     
     required public init?(coder: NSCoder) {
         super.init(coder: coder)
-        fatalError("xib file is not implemented for CheckboxWithLabelView")
+        fatalError("xib file is not implemented for CheckboxLabel")
     }
     
     //--------------------------------------------------
@@ -128,7 +128,7 @@
 }
 
 // MARK: - Molecular
-extension CheckboxWithLabelView {
+extension CheckboxLabel {
     
     open class func estimatedHeight(forRow json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
         return 200
diff --git a/MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift b/MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
index 34b8e6ca..12a1b1bd 100644
--- a/MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
+++ b/MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
@@ -50,7 +50,7 @@ import Foundation
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: GraphView.self, viewModelClass: CircleProgressModel.self)
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: Toggle.self, viewModelClass: ToggleModel.self)
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: Checkbox.self, viewModelClass: CheckboxModel.self)
-        MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: CheckboxWithLabelView.self, viewModelClass: CheckboxLabelModel.self)
+        MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: CheckboxLabel.self, viewModelClass: CheckboxLabelModel.self)
 
         // Horizontal Combination Molecules
         MVMCoreUIMoleculeMappingObject.shared()?.register(viewClass: StringAndMoleculeView.self, viewModelClass: StringAndMoleculeModel.self)
@@ -98,7 +98,7 @@ import Foundation
         MVMCoreUIMoleculeMappingObject.shared()?.moleculeMapping.setObject(DigitEntryField.self, forKey: "digitTextField" as NSString)
         MVMCoreUIMoleculeMappingObject.shared()?.moleculeMapping.setObject(DateDropdownEntryField.self, forKey: "dateDropdownEntryField" as NSString)
         MVMCoreUIMoleculeMappingObject.shared()?.moleculeMapping.setObject(Checkbox.self, forKey: "checkbox" as NSString)
-        MVMCoreUIMoleculeMappingObject.shared()?.moleculeMapping.setObject(CheckboxWithLabelView.self, forKey: "checkboxLabel" as NSString)
+        MVMCoreUIMoleculeMappingObject.shared()?.moleculeMapping.setObject(CheckboxLabel.self, forKey: "checkboxLabel" as NSString)
         MVMCoreUIMoleculeMappingObject.shared()?.moleculeMapping.setObject(RadioButton.self, forKey: "radioButton" as NSString)
         MVMCoreUIMoleculeMappingObject.shared()?.moleculeMapping.setObject(RadioButtonLabel.self, forKey: "radioButtonLabel" as NSString)
         MVMCoreUIMoleculeMappingObject.shared()?.moleculeMapping.setObject(MVMCoreUIPageControl.self, forKey: "barsPager" as NSString)