diff --git a/.gitignore b/.gitignore
index ff6f04385..0445455f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,12 +56,10 @@ android/*.keystore
 
 mobile/*.keystore
 mobile/assets/www
-mobile/bin
-mobile/gen
-mobile/CordovaLib/bin
-mobile/CordovaLib/gen
-mobile/CordovaLib/xwalk_core_library/bin
-mobile/CordovaLib/xwalk_core_library/gen
+mobile/bin/*
+mobile/gen/*
+mobile/cordova/*
+mobile/CordovaLib/*
 
 coverage/
 
diff --git a/mobile/AndroidManifest.xml b/mobile/AndroidManifest.xml
index 792e0d08a..07a55c1bb 100644
--- a/mobile/AndroidManifest.xml
+++ b/mobile/AndroidManifest.xml
@@ -29,7 +29,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <provider android:authorities="com.bipay.copay.plugin.emailcomposer.attachmentprovider" android:name="de.appplant.cordova.plugin.emailcomposer.AttachmentProvider" />
+        <provider android:authorities="com.bitpay.copay.plugin.emailcomposer.attachmentprovider" android:name="de.appplant.cordova.plugin.emailcomposer.AttachmentProvider" />
     </application>
     <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="19" />
     <uses-permission android:name="android.permission.VIBRATE" />
diff --git a/mobile/cordova/plugins/android.json b/mobile/cordova/plugins/android.json
index e9b9dbd8d..62628ffec 100644
--- a/mobile/cordova/plugins/android.json
+++ b/mobile/cordova/plugins/android.json
@@ -61,7 +61,7 @@
                             "count": 1
                         },
                         {
-                            "xml": "<provider android:authorities=\"com.bipay.copay.plugin.emailcomposer.attachmentprovider\" android:name=\"de.appplant.cordova.plugin.emailcomposer.AttachmentProvider\"></provider>",
+                            "xml": "<provider android:authorities=\"com.bitpay.copay.plugin.emailcomposer.attachmentprovider\" android:name=\"de.appplant.cordova.plugin.emailcomposer.AttachmentProvider\"></provider>",
                             "count": 1
                         }
                     ]
@@ -553,16 +553,16 @@
     },
     "installed_plugins": {
         "org.apache.cordova.vibration": {
-            "PACKAGE_NAME": "com.bipay.copay"
+            "PACKAGE_NAME": "com.bitpay.copay"
         },
         "com.phonegap.plugins.barcodescanner": {
-            "PACKAGE_NAME": "com.bipay.copay"
+            "PACKAGE_NAME": "com.bitpay.copay"
         },
         "de.appplant.cordova.plugin.email-composer": {
-            "PACKAGE_NAME": "com.bipay.copay"
+            "PACKAGE_NAME": "com.bitpay.copay"
         },
         "org.apache.cordova.splashscreen": {
-            "PACKAGE_NAME": "com.bipay.copay"
+            "PACKAGE_NAME": "com.bitpay.copay"
         }
     },
     "dependent_plugins": {}
diff --git a/mobile/src/com/bipay/copay/Copay.java b/mobile/src/com/bitpay/copay/Copay.java
similarity index 98%
rename from mobile/src/com/bipay/copay/Copay.java
rename to mobile/src/com/bitpay/copay/Copay.java
index ec6ab4e7c..cec88006c 100644
--- a/mobile/src/com/bipay/copay/Copay.java
+++ b/mobile/src/com/bitpay/copay/Copay.java
@@ -17,7 +17,7 @@
        under the License.
  */
 
-package com.bipay.copay;
+package com.bitpay.copay;
 
 import android.os.Bundle;
 import org.apache.cordova.*;