diff --git a/VDS.xcodeproj/project.pbxproj b/VDS.xcodeproj/project.pbxproj
index 1ba01d97..18741ce7 100644
--- a/VDS.xcodeproj/project.pbxproj
+++ b/VDS.xcodeproj/project.pbxproj
@@ -61,7 +61,7 @@
 		EAB5FED429267EB300998C17 /* UIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB5FED329267EB300998C17 /* UIView.swift */; };
 		EAB5FEED2927E1B200998C17 /* ButtonGroupPositionLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB5FEEC2927E1B200998C17 /* ButtonGroupPositionLayout.swift */; };
 		EAB5FEF12927F4AA00998C17 /* SelfSizingCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB5FEF02927F4AA00998C17 /* SelfSizingCollectionView.swift */; };
-		EAB5FEF5292D371F00998C17 /* BaseButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB5FEF4292D371F00998C17 /* BaseButton.swift */; };
+		EAB5FEF5292D371F00998C17 /* ButtonBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB5FEF4292D371F00998C17 /* ButtonBase.swift */; };
 		EAC9257D29119B5400091998 /* TextLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAC9257C29119B5400091998 /* TextLink.swift */; };
 		EAC925832911B35400091998 /* TextLinkCaret.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAC925822911B35300091998 /* TextLinkCaret.swift */; };
 		EAC925842911C63100091998 /* Colorable.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAA5EEDF28F49DB3003B3210 /* Colorable.swift */; };
@@ -154,7 +154,7 @@
 		EAB5FED329267EB300998C17 /* UIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIView.swift; sourceTree = "<group>"; };
 		EAB5FEEC2927E1B200998C17 /* ButtonGroupPositionLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonGroupPositionLayout.swift; sourceTree = "<group>"; };
 		EAB5FEF02927F4AA00998C17 /* SelfSizingCollectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelfSizingCollectionView.swift; sourceTree = "<group>"; };
-		EAB5FEF4292D371F00998C17 /* BaseButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseButton.swift; sourceTree = "<group>"; };
+		EAB5FEF4292D371F00998C17 /* ButtonBase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonBase.swift; sourceTree = "<group>"; };
 		EAC9257C29119B5400091998 /* TextLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextLink.swift; sourceTree = "<group>"; };
 		EAC925822911B35300091998 /* TextLinkCaret.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextLinkCaret.swift; sourceTree = "<group>"; };
 		EAC925872911C9DE00091998 /* TextEntryField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextEntryField.swift; sourceTree = "<group>"; };
@@ -205,7 +205,7 @@
 			isa = PBXGroup;
 			children = (
 				5FC35BE228D51405004EBEAC /* Button.swift */,
-				EAB5FEF4292D371F00998C17 /* BaseButton.swift */,
+				EAB5FEF4292D371F00998C17 /* ButtonBase.swift */,
 			);
 			path = Button;
 			sourceTree = "<group>";
@@ -657,7 +657,7 @@
 				EAF7F0AF289B144C00B287F5 /* UnderlineLabelAttribute.swift in Sources */,
 				EAC925842911C63100091998 /* Colorable.swift in Sources */,
 				EA3361C5289030FC0071C351 /* Accessable.swift in Sources */,
-				EAB5FEF5292D371F00998C17 /* BaseButton.swift in Sources */,
+				EAB5FEF5292D371F00998C17 /* ButtonBase.swift in Sources */,
 				EA978EC5291D6AFE00ACC883 /* AnyLabelAttribute.swift in Sources */,
 				EA33622C2891E73B0071C351 /* FontProtocol.swift in Sources */,
 				EAF7F11728A1475A00B287F5 /* RadioButton.swift in Sources */,
diff --git a/VDS/Components/Buttons/Button/Button.swift b/VDS/Components/Buttons/Button/Button.swift
index fb43f30f..72953bdb 100644
--- a/VDS/Components/Buttons/Button/Button.swift
+++ b/VDS/Components/Buttons/Button/Button.swift
@@ -17,7 +17,7 @@ public enum ButtonSize: String, Codable, CaseIterable {
 }
 
 @objc(VDSButton)
-open class Button: BaseButton, Useable {
+open class Button: ButtonBase, Useable {
     
     //--------------------------------------------------
     // MARK: - Private Properties
diff --git a/VDS/Components/Buttons/Button/BaseButton.swift b/VDS/Components/Buttons/Button/ButtonBase.swift
similarity index 98%
rename from VDS/Components/Buttons/Button/BaseButton.swift
rename to VDS/Components/Buttons/Button/ButtonBase.swift
index 6a92c0fe..887fff2c 100644
--- a/VDS/Components/Buttons/Button/BaseButton.swift
+++ b/VDS/Components/Buttons/Button/ButtonBase.swift
@@ -17,8 +17,8 @@ public protocol Buttonable: UIControl, Surfaceable, Disabling {
     var intrinsicContentSize: CGSize { get }
 }
 
-@objc(VDSBaseButton)
-open class BaseButton: UIButton, Buttonable, Handlerable, ViewProtocol, Resettable {
+@objc(VDSButtonBase)
+open class ButtonBase: UIButton, Buttonable, Handlerable, ViewProtocol, Resettable {
     
     //--------------------------------------------------
     // MARK: - Combine Properties
diff --git a/VDS/Components/Buttons/TextLink/TextLink.swift b/VDS/Components/Buttons/TextLink/TextLink.swift
index fbe3ab0f..292e28ad 100644
--- a/VDS/Components/Buttons/TextLink/TextLink.swift
+++ b/VDS/Components/Buttons/TextLink/TextLink.swift
@@ -12,7 +12,7 @@ import VDSFormControlsTokens
 import Combine
 
 @objc(VDSTextLink)
-open class TextLink: BaseButton {
+open class TextLink: ButtonBase {
     
     //--------------------------------------------------
     // MARK: - Private Properties
diff --git a/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift b/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift
index e4733a1b..7555095e 100644
--- a/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift
+++ b/VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift
@@ -16,7 +16,7 @@ public enum TextLinkCaretPosition: String, CaseIterable {
 }
 
 @objc(VDSTextLinkCaret)
-open class TextLinkCaret: BaseButton {
+open class TextLinkCaret: ButtonBase {
     
     //--------------------------------------------------
     // MARK: - Private Properties