diff --git a/docs/parameter/cameraError.md b/docs/parameter/cameraError.md
index 7ee091b..f36840f 100644
--- a/docs/parameter/cameraError.md
+++ b/docs/parameter/cameraError.md
@@ -29,4 +29,4 @@ onError callback function that provides an error message.
 Parameters
 ----------
 
-- __message:__ The message is provided by the device's native code. (`String`)
\ No newline at end of file
+- __message:__ The message is provided by the device's native code. (`String`)
diff --git a/docs/parameter/cameraSuccess.md b/docs/parameter/cameraSuccess.md
index 773fba4..e57b296 100644
--- a/docs/parameter/cameraSuccess.md
+++ b/docs/parameter/cameraSuccess.md
@@ -39,4 +39,4 @@ Example
     function cameraCallback(imageData) {
         var image = document.getElementById('myImage');
         image.src = "data:image/jpeg;base64," + imageData;
-    }
\ No newline at end of file
+    }
diff --git a/test/camera/index.html b/test/camera/index.html
index f761fbf..83285e7 100644
--- a/test/camera/index.html
+++ b/test/camera/index.html
@@ -340,7 +340,7 @@
         document.addEventListener("deviceready", function() {
             deviceReady = true;
             platformId = cordova.require('cordova/platform').id;
-            CameraPopoverOptions = cordova.require('org.apache.cordova.core.CameraLauncher.CameraPopoverOptions');
+            CameraPopoverOptions = cordova.require('org.apache.cordova.core.camera.CameraPopoverOptions');
             console.log("Device="+device.platform+" "+device.version);
             createOptionsEl('sourceType', Camera.PictureSourceType, camPictureSourceTypeDefault);
             createOptionsEl('destinationType', Camera.DestinationType, camDestinationTypeDefault);
diff --git a/www/Camera.js b/www/Camera.js
index d6af1e9..db34bb9 100644
--- a/www/Camera.js
+++ b/www/Camera.js
@@ -21,8 +21,8 @@
 
 var argscheck = require('cordova/argscheck'),
     exec = require('cordova/exec'),
-    Camera = require('org.apache.cordova.core.CameraLauncher.Camera'),
-    CameraPopoverHandle = require('org.apache.cordova.core.CameraLauncher.CameraPopoverHandle');
+    Camera = require('org.apache.cordova.core.camera.Camera'),
+    CameraPopoverHandle = require('org.apache.cordova.core.camera.CameraPopoverHandle');
 
 var cameraExport = {};
 
diff --git a/www/CameraPopoverOptions.js b/www/CameraPopoverOptions.js
index 36858a9..3d80930 100644
--- a/www/CameraPopoverOptions.js
+++ b/www/CameraPopoverOptions.js
@@ -19,7 +19,7 @@
  *
 */
 
-var Camera = require('org.apache.cordova.core.CameraLauncher.Camera');
+var Camera = require('org.apache.cordova.core.camera.Camera');
 
 /**
  * Encapsulates options for iOS Popover image picker