diff --git a/framework/res/xml/config.xml b/framework/res/xml/config.xml
index d6a19571..a942ce9f 100644
--- a/framework/res/xml/config.xml
+++ b/framework/res/xml/config.xml
@@ -46,6 +46,6 @@
     -->
     <!-- This is required for native Android hooks -->
     <feature name="App">
-        <param name="android-package" value="org.apache.cordova.App" />
+        <param name="android-package" value="org.apache.cordova.CoreAndroid" />
     </feature>
 </widget>
diff --git a/framework/src/org/apache/cordova/App.java b/framework/src/org/apache/cordova/CoreAndroid.java
similarity index 99%
rename from framework/src/org/apache/cordova/App.java
rename to framework/src/org/apache/cordova/CoreAndroid.java
index 4b15906d..b47efa87 100755
--- a/framework/src/org/apache/cordova/App.java
+++ b/framework/src/org/apache/cordova/CoreAndroid.java
@@ -38,7 +38,7 @@ import java.util.HashMap;
 /**
  * This class exposes methods in Cordova that can be called from JavaScript.
  */
-public class App extends CordovaPlugin {
+public class CoreAndroid extends CordovaPlugin {
 
     protected static final String TAG = "CordovaApp";
     private BroadcastReceiver telephonyReceiver;