diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj
index 952f8826..16458819 100644
--- a/MVMCoreUI.xcodeproj/project.pbxproj
+++ b/MVMCoreUI.xcodeproj/project.pbxproj
@@ -19,7 +19,7 @@
 		01DF567021FA5AB300CC099B /* TextFieldListFormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01DF566F21FA5AB300CC099B /* TextFieldListFormViewController.swift */; };
 		01E569D3223FFFA500327251 /* ThreeLayerViewController.swift in Headers */ = {isa = PBXBuildFile; fileRef = D2A5146A2214905000345BFB /* ThreeLayerViewController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		0A1214A022C11A18007C7030 /* ActionDetailWithImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A12149F22C11A17007C7030 /* ActionDetailWithImage.swift */; };
-		0A804A3D2316CB79009A8656 /* HeadlineBodyButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A804A3C2316CB79009A8656 /* HeadlineBodyButton.swift */; };
+		0A804A3D2316CB79009A8656 /* HeadlineBodyPrimaryButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A804A3C2316CB79009A8656 /* HeadlineBodyPrimaryButton.swift */; };
 		B8200E152280C4CF007245F4 /* ProgressBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8200E142280C4CF007245F4 /* ProgressBar.swift */; };
 		B8200E192281DC1A007245F4 /* CornerLabels.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8200E182281DC1A007245F4 /* CornerLabels.swift */; };
 		D206997721FB8A0B00CAE0DE /* MVMCoreUINavigationController.h in Headers */ = {isa = PBXBuildFile; fileRef = D206997521FB8A0B00CAE0DE /* MVMCoreUINavigationController.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -198,7 +198,7 @@
 		01DF55DF21F8FAA800CC099B /* MFTextFieldListView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MFTextFieldListView.swift; sourceTree = "<group>"; };
 		01DF566F21FA5AB300CC099B /* TextFieldListFormViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextFieldListFormViewController.swift; sourceTree = "<group>"; };
 		0A12149F22C11A17007C7030 /* ActionDetailWithImage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ActionDetailWithImage.swift; sourceTree = "<group>"; };
-		0A804A3C2316CB79009A8656 /* HeadlineBodyButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadlineBodyButton.swift; sourceTree = "<group>"; };
+		0A804A3C2316CB79009A8656 /* HeadlineBodyPrimaryButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadlineBodyPrimaryButton.swift; sourceTree = "<group>"; };
 		B8200E142280C4CF007245F4 /* ProgressBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgressBar.swift; sourceTree = "<group>"; };
 		B8200E182281DC1A007245F4 /* CornerLabels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CornerLabels.swift; sourceTree = "<group>"; };
 		D206997521FB8A0B00CAE0DE /* MVMCoreUINavigationController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreUINavigationController.h; sourceTree = "<group>"; };
@@ -610,7 +610,7 @@
 				DBC4391A224421A0001AB423 /* CaretButton.swift */,
 				D29DF25821E6A22D003B2FB9 /* MFButtonProtocol.h */,
 				D29DF16B21E69E1F003B2FB9 /* ButtonDelegateProtocol.h */,
-				0A804A3C2316CB79009A8656 /* HeadlineBodyButton.swift */,
+				0A804A3C2316CB79009A8656 /* HeadlineBodyPrimaryButton.swift */,
 				D29DF16A21E69E1F003B2FB9 /* MFCustomButton.h */,
 				D29DF17021E69E1F003B2FB9 /* MFCustomButton.m */,
 				D29DF16C21E69E1F003B2FB9 /* PrimaryButton.h */,
@@ -956,7 +956,7 @@
 				01DF567021FA5AB300CC099B /* TextFieldListFormViewController.swift in Sources */,
 				D2A5145F2211DDC100345BFB /* MoleculeStackView.swift in Sources */,
 				D29DF27621E79E81003B2FB9 /* MVMCoreUILoggingHandler.m in Sources */,
-				0A804A3D2316CB79009A8656 /* HeadlineBodyButton.swift in Sources */,
+				0A804A3D2316CB79009A8656 /* HeadlineBodyPrimaryButton.swift in Sources */,
 				D29DF24D21E6A177003B2FB9 /* MFTextField.m in Sources */,
 				D29DF2A221E7AF4E003B2FB9 /* MVMCoreUIUtility.m in Sources */,
 				D29DF12B21E6851E003B2FB9 /* MVMCoreUITopAlertExpandableView.m in Sources */,
diff --git a/MVMCoreUI/Atoms/Buttons/HeadlineBodyButton.swift b/MVMCoreUI/Atoms/Buttons/HeadlineBodyPrimaryButton.swift
similarity index 72%
rename from MVMCoreUI/Atoms/Buttons/HeadlineBodyButton.swift
rename to MVMCoreUI/Atoms/Buttons/HeadlineBodyPrimaryButton.swift
index 78b11f67..029a42c0 100644
--- a/MVMCoreUI/Atoms/Buttons/HeadlineBodyButton.swift
+++ b/MVMCoreUI/Atoms/Buttons/HeadlineBodyPrimaryButton.swift
@@ -1,5 +1,5 @@
 //
-//  HeadlineBodyButton.swift
+//  HeadlineBodyPrimaryButton.swift
 //  MVMCoreUI
 //
 //  Created by Kevin Christiano on 8/28/19.
@@ -9,7 +9,7 @@
 import Foundation
 
 
-@objcMembers open class HeadlineBodyButton: ViewConstrainingView {
+@objcMembers open class HeadlineBodyPrimaryButton: ViewConstrainingView {
     //------------------------------------------------------
     // MARK: - Outlets
     //------------------------------------------------------
@@ -28,9 +28,8 @@ import Foundation
     
     open override func setupView() {
         super.setupView()
-        guard subviews.count == 0 else {
-            return
-        }
+        
+        guard subviews.count == 0 else { return }
         
     }
     
@@ -42,10 +41,7 @@ import Foundation
     // MARK: - JSON
     //------------------------------------------------------
     
-    open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
-        super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
-        
-    }
+    
     
     open override func reset() {