diff --git a/VDSSample.xcodeproj/project.pbxproj b/VDSSample.xcodeproj/project.pbxproj
index 797aeeb..d3d6633 100644
--- a/VDSSample.xcodeproj/project.pbxproj
+++ b/VDSSample.xcodeproj/project.pbxproj
@@ -63,7 +63,7 @@
 		EA985C19296CC73D00F2FF2E /* VDSIcons.bundle in Embed PlugIns */ = {isa = PBXBuildFile; fileRef = EA985C14296CC5EE00F2FF2E /* VDSIcons.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		EA985C1B296CC74A00F2FF2E /* VDSIcons.bundle in Resources */ = {isa = PBXBuildFile; fileRef = EA985C14296CC5EE00F2FF2E /* VDSIcons.bundle */; };
 		EA985C20296DECF600F2FF2E /* IconName.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985C1F296DECF600F2FF2E /* IconName.swift */; };
-		EAA5EEAD28EB6924003B3210 /* TextEntryFieldViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAA5EEAC28EB6924003B3210 /* TextEntryFieldViewController.swift */; };
+		EAA5EEAD28EB6924003B3210 /* InputFieldViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAA5EEAC28EB6924003B3210 /* InputFieldViewController.swift */; };
 		EAB1D2C928AAAA1D00DAE764 /* BaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB1D2C828AAAA1D00DAE764 /* BaseViewController.swift */; };
 		EAB1D2D428AC409F00DAE764 /* LabelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB1D2D328AC409F00DAE764 /* LabelViewController.swift */; };
 		EAB5FEEF2927E28400998C17 /* ButtonGroupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB5FEEE2927E28400998C17 /* ButtonGroupViewController.swift */; };
@@ -143,7 +143,7 @@
 		EA985C00296CC21C00F2FF2E /* IconViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IconViewController.swift; sourceTree = "<group>"; };
 		EA985C14296CC5EE00F2FF2E /* VDSIcons.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = VDSIcons.bundle; path = SharedFrameworks/VDSIcons.bundle; sourceTree = "<group>"; };
 		EA985C1F296DECF600F2FF2E /* IconName.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconName.swift; sourceTree = "<group>"; };
-		EAA5EEAC28EB6924003B3210 /* TextEntryFieldViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextEntryFieldViewController.swift; sourceTree = "<group>"; };
+		EAA5EEAC28EB6924003B3210 /* InputFieldViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputFieldViewController.swift; sourceTree = "<group>"; };
 		EAB1D2C828AAAA1D00DAE764 /* BaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseViewController.swift; sourceTree = "<group>"; };
 		EAB1D2D328AC409F00DAE764 /* LabelViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelViewController.swift; sourceTree = "<group>"; };
 		EAB5FEEE2927E28400998C17 /* ButtonGroupViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ButtonGroupViewController.swift; sourceTree = "<group>"; };
@@ -281,12 +281,12 @@
 				EA89204D28B67332006B9984 /* CheckBoxGroupViewController.swift */,
 				EAF7F09B2899B92400B287F5 /* CheckboxViewController.swift */,
 				EA985C00296CC21C00F2FF2E /* IconViewController.swift */,
+				EAC9257F29119FC400091998 /* TextLinkViewController.swift */,
 				EAB1D2D328AC409F00DAE764 /* LabelViewController.swift */,
 				EA89201828B56DF5006B9984 /* RadioBoxGroupViewController.swift */,
 				EAF7F11928A14A0E00B287F5 /* RadioButtonViewController.swift */,
 				EA84F76128BE4AE500D67ABC /* RadioSwatchGroupViewController.swift */,
-				EAA5EEAC28EB6924003B3210 /* TextEntryFieldViewController.swift */,
-				EAC9257F29119FC400091998 /* TextLinkViewController.swift */,
+				EAA5EEAC28EB6924003B3210 /* InputFieldViewController.swift */,
 				EA0FC2C02912DC5500DF80B4 /* TextLinkCaretViewController.swift */,
 				EA5E304F294D11540082B959 /* TileContainerViewController.swift */,
 				EA5E305B295111050082B959 /* TiletViewController.swift */,
@@ -462,7 +462,7 @@
 				EA0FC2C12912DC5500DF80B4 /* TextLinkCaretViewController.swift in Sources */,
 				EAF7F09C2899B92400B287F5 /* CheckboxViewController.swift in Sources */,
 				EA89204E28B67332006B9984 /* CheckBoxGroupViewController.swift in Sources */,
-				EAA5EEAD28EB6924003B3210 /* TextEntryFieldViewController.swift in Sources */,
+				EAA5EEAD28EB6924003B3210 /* InputFieldViewController.swift in Sources */,
 				EA985C20296DECF600F2FF2E /* IconName.swift in Sources */,
 				EA89204928B66CE2006B9984 /* KeyboardFrameChangeListening.swift in Sources */,
 				EA985C01296CC21C00F2FF2E /* IconViewController.swift in Sources */,
diff --git a/VDSSample/ViewControllers/TextEntryFieldViewController.swift b/VDSSample/ViewControllers/InputFieldViewController.swift
similarity index 98%
rename from VDSSample/ViewControllers/TextEntryFieldViewController.swift
rename to VDSSample/ViewControllers/InputFieldViewController.swift
index 1b289eb..006573d 100644
--- a/VDSSample/ViewControllers/TextEntryFieldViewController.swift
+++ b/VDSSample/ViewControllers/InputFieldViewController.swift
@@ -11,7 +11,7 @@ import VDS
 import VDSColorTokens
 import Combine
 
-class  TextEntryFieldViewController: BaseViewController {
+class  InputFieldViewController: BaseViewController {
 
     lazy var helperTextPlacementPickerSelectorView = {
         PickerSelectorView(title: "",
@@ -31,7 +31,7 @@ class  TextEntryFieldViewController: BaseViewController {
     var tooltipTitleTextField = TextField()
     var tooltipContentTextField = TextField()
 
-    var textEntryField = TextEntryField()
+    var textEntryField = InputField()
     
     override func viewDidLoad() {
         super.viewDidLoad()
diff --git a/VDSSample/ViewControllers/MenuViewController.swift b/VDSSample/ViewControllers/MenuViewController.swift
index def5b64..7bb2a86 100644
--- a/VDSSample/ViewControllers/MenuViewController.swift
+++ b/VDSSample/ViewControllers/MenuViewController.swift
@@ -77,11 +77,11 @@ class MenuViewController: UITableViewController {
         MenuComponent(title: "Checkbox", completed: true, viewController: CheckboxViewController.self),
         MenuComponent(title: "CheckboxGroup", completed: true, viewController: CheckboxGroupViewController.self),
         MenuComponent(title: "Icon", completed: true, viewController: IconViewController.self),
+        MenuComponent(title: "InputField", completed: false, viewController: InputFieldViewController.self),
         MenuComponent(title: "Label", completed: true, viewController: LabelViewController.self),
         MenuComponent(title: "RadioBoxGroup", completed: true, viewController: RadioBoxGroupViewController.self),
         MenuComponent(title: "RadioButtonGroup", completed: true, viewController: RadioButtonViewController.self),
         MenuComponent(title: "RadioSwatchGroup", completed: true, viewController: RadioSwatchGroupViewController.self),
-        MenuComponent(title: "TextEntryField", completed: false, viewController: TextEntryFieldViewController.self),
         MenuComponent(title: "TextLink", completed: true, viewController: TextLinkViewController.self),
         MenuComponent(title: "TextLinkCaret", completed: true, viewController: TextLinkCaretViewController.self),
         MenuComponent(title: "TileContainer", completed: false, viewController: TileContainerViewController.self),