diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidContactsTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidContactsTest.java
index 40fcc7007..63ad8674e 100644
--- a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidContactsTest.java
+++ b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidContactsTest.java
@@ -23,9 +23,10 @@ public class AndroidContactsTest {
         File appDir = new File(classpathRoot, "../../../apps/ContactManager");
         File app = new File(appDir, "ContactManager.apk");
         DesiredCapabilities capabilities = new DesiredCapabilities();
-        capabilities.setCapability("device","Android");
         capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
-        capabilities.setCapability(CapabilityType.VERSION, "4.4");
+        capabilities.setCapability("platformName", "Android");
+        capabilities.setCapability("deviceName","Android Emulator");
+        capabilities.setCapability("platformVersion", "4.4");
         capabilities.setCapability("app", app.getAbsolutePath());
         capabilities.setCapability("app-package", "com.example.android.contactmanager");
         capabilities.setCapability("app-activity", ".ContactManager");
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidTest.java
index 13708158a..400fe1103 100644
--- a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidTest.java
+++ b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidTest.java
@@ -25,9 +25,10 @@ public class AndroidTest {
         File appDir = new File(classpathRoot, "../../../apps/ApiDemos/bin");
         File app = new File(appDir, "ApiDemos-debug.apk");
         DesiredCapabilities capabilities = new DesiredCapabilities();
-        capabilities.setCapability("device","Android");
         capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
-        capabilities.setCapability(CapabilityType.VERSION, "4.4");
+        capabilities.setCapability("deviceName","Android Emulator");
+        capabilities.setCapability("platformVersion", "4.4");
+        capabilities.setCapability("platformName","Android");
         capabilities.setCapability("app", app.getAbsolutePath());
         capabilities.setCapability("app-package", "com.example.android.apis");
         capabilities.setCapability("app-activity", ".ApiDemos");
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidWebViewTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidWebViewTest.java
index ba229db00..cf0f6149f 100644
--- a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidWebViewTest.java
+++ b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidWebViewTest.java
@@ -22,8 +22,9 @@ public class AndroidWebViewTest {
         File classpathRoot = new File(System.getProperty("user.dir"));
         File app = new File(classpathRoot, "../../../apps/selendroid-test-app.apk");
         DesiredCapabilities capabilities = new DesiredCapabilities();
-        capabilities.setCapability("automationName","selendroid");
-        capabilities.setCapability(CapabilityType.PLATFORM, "android");
+        capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
+        capabilities.setCapability("automationName","Selendroid");
+        capabilities.setCapability("platformName", "Android");
         capabilities.setCapability("app", app.getAbsolutePath());
         capabilities.setCapability("app-package", "io.selendroid.testapp");
         capabilities.setCapability("app-activity", ".HomeScreenActivity");
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/MobileFindJavaTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/MobileFindJavaTest.java
index fa88aec3b..fe55b844e 100644
--- a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/MobileFindJavaTest.java
+++ b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/MobileFindJavaTest.java
@@ -64,8 +64,9 @@ public class MobileFindJavaTest {
   @Before
   public void setUp() throws Exception {
     final DesiredCapabilities capabilities = new DesiredCapabilities();
-    capabilities.setCapability("device", "android");
-    capabilities.setCapability(CapabilityType.PLATFORM, "android");
+    capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
+    capabilities.setCapability("deviceName", "Android Emulator");
+    capabilities.setCapability("platformName", "Android");
     capabilities.setCapability("appPackage", "com.android.settings");
     capabilities.setCapability("appActivity", ".Settings");
     driver = new AppiumDriver(new URL(url), capabilities);
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SafariTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SafariTest.java
index d8ba952ba..deb046ee3 100644
--- a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SafariTest.java
+++ b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SafariTest.java
@@ -33,9 +33,9 @@ public class SafariTest {
     @Before
     public void setUp() throws Exception {
         DesiredCapabilities capabilities = new DesiredCapabilities();
-        capabilities.setCapability("device", "iPhone Simulator");
+        capabilities.setCapability("deviceName", "iPhone Simulator");
         capabilities.setCapability("platformName", "iOS");
-        capabilities.setCapability("version", "7.1");
+        capabilities.setCapability("platformVersion", "7.1");
         capabilities.setCapability("browserName", "safari");
         driver = new RemoteWebDriver(new URL("http://127.0.0.1:4723/wd/hub"),
                 capabilities);
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SauceTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SauceTest.java
index 96a5a7398..bcd434a85 100644
--- a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SauceTest.java
+++ b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SauceTest.java
@@ -70,10 +70,11 @@ public class SauceTest implements SauceOnDemandSessionIdProvider {
         String sauceAccessKey = authentication.getAccessKey();
         DesiredCapabilities capabilities = new DesiredCapabilities();
         capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
-        capabilities.setCapability(CapabilityType.VERSION, "6.0");
-        capabilities.setCapability("device", "iPhone Simulator");
-        capabilities.setCapability(CapabilityType.PLATFORM, "Mac 10.8");
-        capabilities.setCapability("app", "http://appium.s3.amazonaws.com/TestApp6.0.app.zip");
+        capabilities.setCapability("platformVersion", "6.0");
+        capabilities.setCapability("deviceName", "iPhone Simulator");
+        capabilities.setCapability("platformName", "iOS");
+        capabilities.setCapability("appium-version", "1.0.0");
+      capabilities.setCapability("app", "http://appium.s3.amazonaws.com/TestApp6.0.app.zip");
 
         driver = new AppiumDriver(new URL(MessageFormat.format("http://{0}:{1}@ondemand.saucelabs.com:80/wd/hub", sauceUserName, sauceAccessKey)),
                 capabilities);
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SimpleTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SimpleTest.java
index 9ae41bf47..eb5b72f7f 100644
--- a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SimpleTest.java
+++ b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SimpleTest.java
@@ -48,9 +48,9 @@ public class SimpleTest {
         File app = new File(appDir, "TestApp.app");
         DesiredCapabilities capabilities = new DesiredCapabilities();
         capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
-        capabilities.setCapability(CapabilityType.VERSION, "7.1");
-        capabilities.setCapability(CapabilityType.PLATFORM, "Mac");
-        capabilities.setCapability("device", "iPhone Simulator");
+        capabilities.setCapability("platformVersion", "7.1");
+        capabilities.setCapability("platformName", "iOS");
+        capabilities.setCapability("deviceName", "iPhone Simulator");
         capabilities.setCapability("app", app.getAbsolutePath());
         driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
         values = new ArrayList<Integer>();
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/UICatalogTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/UICatalogTest.java
index 98254b520..95c064514 100644
--- a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/UICatalogTest.java
+++ b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/UICatalogTest.java
@@ -47,9 +47,9 @@ public class UICatalogTest {
         File app = new File(appDir, "UICatalog.app");
         DesiredCapabilities capabilities = new DesiredCapabilities();
         capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
-        capabilities.setCapability(CapabilityType.VERSION, "7.1");
-        capabilities.setCapability(CapabilityType.PLATFORM, "Mac");
-        capabilities.setCapability("device", "iPhone Simulator");
+        capabilities.setCapability("platformVersion", "7.1");
+        capabilities.setCapability("platformName", "iOS");
+        capabilities.setCapability("deviceName", "iPhone Simulator");
         capabilities.setCapability("app", app.getAbsolutePath());
         driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
     }