diff --git a/VDS.xcworkspace/contents.xcworkspacedata b/VDS.xcworkspace/contents.xcworkspacedata
index 46812d6..91951bf 100644
--- a/VDS.xcworkspace/contents.xcworkspacedata
+++ b/VDS.xcworkspace/contents.xcworkspacedata
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Workspace
    version = "1.0">
-   <FileRef
-      location = "group:vds_ios/VDS.xcodeproj">
-   </FileRef>
    <FileRef
       location = "container:VDSSample.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:vds_ios/VDS.xcodeproj">
+   </FileRef>
 </Workspace>
diff --git a/VDSSample/ViewControllers/CheckboxViewController.swift b/VDSSample/ViewControllers/CheckboxViewController.swift
index e78f099..cda044f 100644
--- a/VDSSample/ViewControllers/CheckboxViewController.swift
+++ b/VDSSample/ViewControllers/CheckboxViewController.swift
@@ -44,7 +44,7 @@ class  CheckboxViewController: UIViewController, StoryboardInitable {
         model.errorText = "Error Text"
         
         surfaceLabel.text = model.surface.rawValue
-        disabledSwitch.isOn = model.on
+        disabledSwitch.isOn = model.selected
         labelTextField.text = model.labelText
         childTextField.text = model.childText
         showErrorSwitch.isOn = model.showError
diff --git a/VDSSample/ViewControllers/RadioButtonViewController.swift b/VDSSample/ViewControllers/RadioButtonViewController.swift
index 0dc4666..b6be301 100644
--- a/VDSSample/ViewControllers/RadioButtonViewController.swift
+++ b/VDSSample/ViewControllers/RadioButtonViewController.swift
@@ -44,7 +44,7 @@ class  RadioButtonViewController: UIViewController, StoryboardInitable {
         model.errorText = "Error Text"
         
         surfaceLabel.text = model.surface.rawValue
-        disabledSwitch.isOn = model.on
+        disabledSwitch.isOn = model.selected
         labelTextField.text = model.labelText
         childTextField.text = model.childText
         showErrorSwitch.isOn = model.showError