diff --git a/VDSSample.xcodeproj/xcuserdata/mattbruce.xcuserdatad/xcschemes/xcschememanagement.plist b/VDSSample.xcodeproj/xcuserdata/mattbruce.xcuserdatad/xcschemes/xcschememanagement.plist
index d2c0116..fef7a06 100644
--- a/VDSSample.xcodeproj/xcuserdata/mattbruce.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/VDSSample.xcodeproj/xcuserdata/mattbruce.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>VDSSample.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>3</integer>
 		</dict>
 	</dict>
 </dict>
diff --git a/VDSSample/ViewControllers/CheckboxViewController.swift b/VDSSample/ViewControllers/CheckboxViewController.swift
index 87dd17c..4839f95 100644
--- a/VDSSample/ViewControllers/CheckboxViewController.swift
+++ b/VDSSample/ViewControllers/CheckboxViewController.swift
@@ -27,7 +27,7 @@ class  CheckboxViewController: UIViewController, StoryboardInitable {
     @IBOutlet weak var showErrorSwitch: UISwitch!
     @IBOutlet weak var errorTextField: UITextField!
     
-    var checkbox: VDSCheckbox!
+    var checkbox: Checkbox!
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -44,7 +44,7 @@ class  CheckboxViewController: UIViewController, StoryboardInitable {
         showErrorSwitch.isOn = model.showError
         errorTextField.text = model.errorText
         
-        checkbox = VDSCheckbox(with: model)
+        checkbox = Checkbox(with: model)
         checkbox.translatesAutoresizingMaskIntoConstraints = false
         checkboxContainerView.addSubview(checkbox)
         checkbox.leadingAnchor.constraint(equalTo: checkboxContainerView.leadingAnchor, constant: 20).isActive = true
diff --git a/VDSSample/ViewControllers/ToggleViewController.swift b/VDSSample/ViewControllers/ToggleViewController.swift
index c793f3b..49ecfdf 100644
--- a/VDSSample/ViewControllers/ToggleViewController.swift
+++ b/VDSSample/ViewControllers/ToggleViewController.swift
@@ -25,12 +25,12 @@ class ToggleViewController: UIViewController, StoryboardInitable {
     @IBOutlet weak var fontWeightLabel: UILabel!
     @IBOutlet weak var showTextStack: UIStackView!
         
-    var toggle: VDSToggle!
+    var toggle: Toggle!
 
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        toggle = VDSToggle()
+        toggle = Toggle()
         toggle.translatesAutoresizingMaskIntoConstraints = false
         toggleContainerView.addSubview(toggle)
         toggle.leadingAnchor.constraint(equalTo: toggleContainerView.leadingAnchor, constant: 20).isActive = true