diff --git a/android/adb.js b/android/adb.js
index 0e972a4f8..cc09811d3 100644
--- a/android/adb.js
+++ b/android/adb.js
@@ -513,7 +513,7 @@ ADB.prototype.startSelendroid = function(serverPath, onReady) {
 ADB.prototype.pushSelendroid = function(cb) {
   var cmd = "adb shell am instrument -e main_activity '" + this.appPackage +
             "." + this.appActivity + "' " + this.appPackage +
-            ".selendroid/org.openqa.selendroid.ServerInstrumentation";
+            ".selendroid/io.selendroid.ServerInstrumentation";
   logger.info("Starting instrumentation process for selendroid with cmd: " +
               cmd);
   exec(cmd, function(err, stdout) {
diff --git a/grunt-helpers.js b/grunt-helpers.js
index ca598d208..b5d279de7 100644
--- a/grunt-helpers.js
+++ b/grunt-helpers.js
@@ -417,14 +417,15 @@ module.exports.buildSelendroidServer = function(cb) {
   console.log("Building selendroid server");
   getSelendroidVersion(function(err, version) {
     if (err) return cb(err);
-    var buildDir = path.resolve(__dirname, "submodules/selendroid/selendroid-server");
-    var target = buildDir + "/target/selendroid-server-" + version + ".apk";
-    var destDir = path.resolve(__dirname, "build/selendroid");
+    var buildDir = path.resolve(__dirname, "submodules", "selendroid");
+    var target = path.resolve(buildDir, "selendroid-server", "target",
+      "selendroid-server-" + version + ".apk");
+    var destDir = path.resolve(__dirname, "build", "selendroid");
     var destBin = path.resolve(destDir, "selendroid.apk");
     var srcManifest = path.resolve(__dirname, "submodules", "selendroid",
-      "selendroid-gem", "selendroid-prebuild", "AndroidManifest.xml");
-    var dstManifeset = path.resolve(destDir, "AndroidManifest.xml");
-    var cmd = "mvn install";
+      "selendroid-server", "AndroidManifest.xml");
+    var dstManifest = path.resolve(destDir, "AndroidManifest.xml");
+    var cmd = "mvn clean install";
     exec(cmd, {cwd: buildDir}, function(err, stdout, stderr) {
       if (err) {
         console.error("Unable to build selendroid server. Stdout was: ");
@@ -455,12 +456,29 @@ module.exports.buildSelendroidServer = function(cb) {
                 return cb(err);
               }
               console.log("Copying selendroid manifest as well");
-              ncp(srcManifest, dstManifeset, function(err) {
+              ncp(srcManifest, dstManifest, function(err) {
                 if (err) {
                   console.error("Could not copy manifest");
                   return cb(err);
                 }
-                cb(null);
+                console.log("Modifying manifest for no icons");
+                fs.readFile(dstManifest, function(err, data) {
+                  if (err) {
+                    console.error("Could not open new manifest");
+                    return cb(err);
+                  }
+                  data = data.toString('utf8');
+                  console.log(data);
+                  var iconRe = /application[\s\S]+android:icon="[^"]+"/;
+                  data = data.replace(iconRe, "application");
+                  fs.writeFile(dstManifest, data, function(err) {
+                    if (err) {
+                      console.error("Could not write modified manifest");
+                      return cb(err);
+                    }
+                    cb(null);
+                  });
+                });
               });
             });
           });
diff --git a/reset.sh b/reset.sh
index 9d451c988..c5ccb94a4 100755
--- a/reset.sh
+++ b/reset.sh
@@ -128,11 +128,14 @@ reset_apidemos() {
 
 reset_gps_demo() {
     if $hardcore ; then
-        run_cmd rm -rf sample-code/apps/gps-demo/*
+        echo "* Removing previous copies of the gps demo"
+        run_cmd rm -rf sample-code/apps/gps-demo
+        run_cmd rm -rf sample-code/apps/gps-demo.zip
     fi
-    if [ ! test -f sample-code/apps/gps-demo.zip ]; then
+    if [ ! -d sample-code/apps/gps-demo ]; then
+        echo "* Downloading gps demo"
         run_cmd pushd sample-code/apps
-        run_cmd curl http://www.impressive-artworx.de/tutorials/android/gps_tutorial_1.zip > gps-demo.zip
+        run_cmd curl http://www.impressive-artworx.de/tutorials/android/gps_tutorial_1.zip -o gps-demo.zip -s
         run_cmd unzip gps-demo.zip
         run_cmd mv GPSTutorial1 gps-demo
         run_cmd popd
@@ -172,6 +175,9 @@ reset_selendroid() {
         echo "* Linking selendroid test app: WebViewDemo"
         run_cmd rm -rf $appium_home/sample-code/apps/WebViewDemo
         run_cmd ln -s $appium_home/submodules/selendroid/selendroid-test-app $appium_home/sample-code/apps/WebViewDemo
+        uninstall_android_app io.selendroid.testapp
+        uninstall_android_app io.selendroid.testapp.selendroid
+        # keep older versions of package around to clean up
         uninstall_android_app org.openqa.selendroid.testapp
         uninstall_android_app org.openqa.selendroid.testapp.selendroid
     fi
diff --git a/sample-code/examples/python/android_web_view.py b/sample-code/examples/python/android_web_view.py
index 5b17053a5..a5df835f9 100644
--- a/sample-code/examples/python/android_web_view.py
+++ b/sample-code/examples/python/android_web_view.py
@@ -16,7 +16,7 @@ class TestAndroidWebView(unittest.TestCase):
             'device': 'selendroid',
             'app': app,
             'browserName': "native-android-driver",
-            'app-package': 'org.openqa.selendroid.testapp',
+            'app-package': 'io.selendroid.testapp',
             'app-activity': 'HomeScreenActivity'
         }
 
diff --git a/test/functional/selendroid/web_view.js b/test/functional/selendroid/web_view.js
index 1cd5df871..0eabb2d4a 100644
--- a/test/functional/selendroid/web_view.js
+++ b/test/functional/selendroid/web_view.js
@@ -3,7 +3,7 @@
 
 var path = require('path')
   , appPath = path.resolve(__dirname, "../../../sample-code/apps/WebViewDemo/target/selendroid-test-app-0.4-SNAPSHOT.apk")
-  , appPkg = "org.openqa.selendroid.testapp"
+  , appPkg = "io.selendroid.testapp"
   , appAct = "HomeScreenActivity"
   , driverBlock = require("../../helpers/driverblock.js")
   , describeWd = driverBlock.describeForApp(appPath, "selendroid", appPkg, appAct)