diff --git a/framework/src/org/apache/cordova/App.java b/framework/src/org/apache/cordova/App.java
index 965f9de7..627d072d 100755
--- a/framework/src/org/apache/cordova/App.java
+++ b/framework/src/org/apache/cordova/App.java
@@ -30,7 +30,7 @@ import org.json.JSONObject;
 import java.util.HashMap;
 
 /**
- * This class exposes methods in DroidGap that can be called from JavaScript.
+ * This class exposes methods in Cordova that can be called from JavaScript.
  */
 public class App extends CordovaPlugin {
 
@@ -104,7 +104,7 @@ public class App extends CordovaPlugin {
      * Load the url into the webview.
      *
      * @param url
-     * @param props			Properties that can be passed in to the DroidGap activity (i.e. loadingDialog, wait, ...)
+     * @param props			Properties that can be passed in to the Cordova activity (i.e. loadingDialog, wait, ...)
      * @throws JSONException
      */
     public void loadUrl(String url, JSONObject props) throws JSONException {
diff --git a/framework/src/org/apache/cordova/CordovaActivity.java b/framework/src/org/apache/cordova/CordovaActivity.java
index 097b3252..c9580fbd 100755
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -117,7 +117,7 @@ import android.widget.LinearLayout;
  * Cordova.xml configuration:
  *      Cordova uses a configuration file at res/xml/cordova.xml to specify the following settings.
  *
- *      Approved list of URLs that can be loaded into DroidGap
+ *      Approved list of URLs that can be loaded into Cordova
  *          <access origin="http://server regexp" subdomains="true" />
  *      Log level: ERROR, WARN, INFO, DEBUG, VERBOSE (default=ERROR)
  *          <log level="DEBUG" />
@@ -952,7 +952,7 @@ public class CordovaActivity extends Activity implements CordovaInterface {
     }
 
     /*
-     * Hook in DroidGap for menu plugins
+     * Hook in Cordova for menu plugins
      *
      */
     @Override
@@ -991,7 +991,7 @@ public class CordovaActivity extends Activity implements CordovaInterface {
      * @param url           The url to load.
      * @param openExternal  Load url in browser instead of Cordova webview.
      * @param clearHistory  Clear the history stack, so new page becomes top of history
-     * @param params        DroidGap parameters for new app
+     * @param params        Parameters for new app
      */
     public void showWebPage(String url, boolean openExternal, boolean clearHistory, HashMap<String, Object> params) {
         if (this.appView != null) {
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index afb1e7f7..9796ed83 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -555,7 +555,7 @@ public class CordovaWebView extends WebView {
      * @param url           The url to load.
      * @param openExternal  Load url in browser instead of Cordova webview.
      * @param clearHistory  Clear the history stack, so new page becomes top of history
-     * @param params        DroidGap parameters for new app
+     * @param params        Parameters for new app
      */
     public void showWebPage(String url, boolean openExternal, boolean clearHistory, HashMap<String, Object> params) {
         LOG.d(TAG, "showWebPage(%s, %b, %b, HashMap", url, openExternal, clearHistory);
@@ -601,7 +601,7 @@ public class CordovaWebView extends WebView {
 
     /**
      * Check configuration parameters from Config.
-     * Approved list of URLs that can be loaded into DroidGap
+     * Approved list of URLs that can be loaded into Cordova
      *      <access origin="http://server regexp" subdomains="true" />
      * Log level: ERROR, WARN, INFO, DEBUG, VERBOSE (default=ERROR)
      *      <log level="DEBUG" />
diff --git a/framework/src/org/apache/cordova/Device.java b/framework/src/org/apache/cordova/Device.java
index d9d99282..b1cb2bb8 100644
--- a/framework/src/org/apache/cordova/Device.java
+++ b/framework/src/org/apache/cordova/Device.java
@@ -101,7 +101,7 @@ public class Device extends CordovaPlugin {
     /**
      * Listen for telephony events: RINGING, OFFHOOK and IDLE
      * Send these events to all plugins using
-     *      DroidGap.onMessage("telephone", "ringing" | "offhook" | "idle")
+     *      CordovaActivity.onMessage("telephone", "ringing" | "offhook" | "idle")
      */
     private void initTelephonyReceiver() {
         IntentFilter intentFilter = new IntentFilter();