diff --git a/src/@ionic-native/plugins/actionsheet/index.ts b/src/@ionic-native/plugins/action-sheet/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/actionsheet/index.ts
rename to src/@ionic-native/plugins/action-sheet/index.ts
diff --git a/src/@ionic-native/plugins/admob/index.ts b/src/@ionic-native/plugins/ad-mob/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/admob/index.ts
rename to src/@ionic-native/plugins/ad-mob/index.ts
diff --git a/src/@ionic-native/plugins/appavailability/index.ts b/src/@ionic-native/plugins/app-availability/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/appavailability/index.ts
rename to src/@ionic-native/plugins/app-availability/index.ts
diff --git a/src/@ionic-native/plugins/apprate/index.ts b/src/@ionic-native/plugins/app-rate/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/apprate/index.ts
rename to src/@ionic-native/plugins/app-rate/index.ts
diff --git a/src/@ionic-native/plugins/appversion/index.ts b/src/@ionic-native/plugins/app-version/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/appversion/index.ts
rename to src/@ionic-native/plugins/app-version/index.ts
diff --git a/src/@ionic-native/plugins/backgroundmode/index.ts b/src/@ionic-native/plugins/background-mode/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/backgroundmode/index.ts
rename to src/@ionic-native/plugins/background-mode/index.ts
diff --git a/src/@ionic-native/plugins/barcodescanner/index.ts b/src/@ionic-native/plugins/barcode-scanner/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/barcodescanner/index.ts
rename to src/@ionic-native/plugins/barcode-scanner/index.ts
diff --git a/src/@ionic-native/plugins/base64togallery/index.ts b/src/@ionic-native/plugins/base64-to-gallery/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/base64togallery/index.ts
rename to src/@ionic-native/plugins/base64-to-gallery/index.ts
diff --git a/src/@ionic-native/plugins/batterystatus/index.ts b/src/@ionic-native/plugins/battery-status/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/batterystatus/index.ts
rename to src/@ionic-native/plugins/battery-status/index.ts
diff --git a/src/@ionic-native/plugins/bluetoothserial/index.ts b/src/@ionic-native/plugins/bluetooth-serial/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/bluetoothserial/index.ts
rename to src/@ionic-native/plugins/bluetooth-serial/index.ts
diff --git a/src/@ionic-native/plugins/datepicker/index.ts b/src/@ionic-native/plugins/date-picker/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/datepicker/index.ts
rename to src/@ionic-native/plugins/date-picker/index.ts
diff --git a/src/@ionic-native/plugins/dbmeter/index.ts b/src/@ionic-native/plugins/db-meter/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/dbmeter/index.ts
rename to src/@ionic-native/plugins/db-meter/index.ts
diff --git a/src/@ionic-native/plugins/deviceaccounts/index.ts b/src/@ionic-native/plugins/device-accounts/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/deviceaccounts/index.ts
rename to src/@ionic-native/plugins/device-accounts/index.ts
diff --git a/src/@ionic-native/plugins/devicemotion/index.ts b/src/@ionic-native/plugins/device-motion/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/devicemotion/index.ts
rename to src/@ionic-native/plugins/device-motion/index.ts
diff --git a/src/@ionic-native/plugins/deviceorientation/index.ts b/src/@ionic-native/plugins/device-orientation/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/deviceorientation/index.ts
rename to src/@ionic-native/plugins/device-orientation/index.ts
diff --git a/src/@ionic-native/plugins/emailcomposer/index.ts b/src/@ionic-native/plugins/email-composer/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/emailcomposer/index.ts
rename to src/@ionic-native/plugins/email-composer/index.ts
diff --git a/src/@ionic-native/plugins/googleanalytics/index.ts b/src/@ionic-native/plugins/google-analytics/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/googleanalytics/index.ts
rename to src/@ionic-native/plugins/google-analytics/index.ts
diff --git a/src/@ionic-native/plugins/googlemap/index.ts b/src/@ionic-native/plugins/google-maps/index.ts
similarity index 99%
rename from src/@ionic-native/plugins/googlemap/index.ts
rename to src/@ionic-native/plugins/google-maps/index.ts
index 772842135..daac3de64 100644
--- a/src/@ionic-native/plugins/googlemap/index.ts
+++ b/src/@ionic-native/plugins/google-maps/index.ts
@@ -476,7 +476,7 @@ export class GoogleMapsObject {
  * GoogleMapsObject
  */
 @Plugin({
-  pluginName: 'GoogleMap',
+  pluginName: 'GoogleMaps',
   pluginRef: 'plugin.google.maps.Map',
   plugin: 'cordova-plugin-googlemaps',
   repo: 'https://github.com/mapsplugin/cordova-plugin-googlemaps',
@@ -484,7 +484,7 @@ export class GoogleMapsObject {
   installVariables: ['API_KEY_FOR_ANDROID', 'API_KEY_FOR_IOS']
 })
 @Injectable()
-export class GoogleMap {
+export class GoogleMaps {
 
   /**
    * Creates a new GoogleMap instance
diff --git a/src/@ionic-native/plugins/headercolor/index.ts b/src/@ionic-native/plugins/header-color/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/headercolor/index.ts
rename to src/@ionic-native/plugins/header-color/index.ts
diff --git a/src/@ionic-native/plugins/imagepicker/index.ts b/src/@ionic-native/plugins/image-picker/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/imagepicker/index.ts
rename to src/@ionic-native/plugins/image-picker/index.ts
diff --git a/src/@ionic-native/plugins/imageresizer/index.ts b/src/@ionic-native/plugins/image-resizer/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/imageresizer/index.ts
rename to src/@ionic-native/plugins/image-resizer/index.ts
diff --git a/src/@ionic-native/plugins/inappbrowser/index.ts b/src/@ionic-native/plugins/in-app-browser/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/inappbrowser/index.ts
rename to src/@ionic-native/plugins/in-app-browser/index.ts
diff --git a/src/@ionic-native/plugins/inapppurchase/index.ts b/src/@ionic-native/plugins/in-app-purchase/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/inapppurchase/index.ts
rename to src/@ionic-native/plugins/in-app-purchase/index.ts
diff --git a/src/@ionic-native/plugins/launchnavigator/index.ts b/src/@ionic-native/plugins/launch-navigator/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/launchnavigator/index.ts
rename to src/@ionic-native/plugins/launch-navigator/index.ts
diff --git a/src/@ionic-native/plugins/localnotifications/index.ts b/src/@ionic-native/plugins/local-notifications/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/localnotifications/index.ts
rename to src/@ionic-native/plugins/local-notifications/index.ts
diff --git a/src/@ionic-native/plugins/nativestorage/index.ts b/src/@ionic-native/plugins/native-storage/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/nativestorage/index.ts
rename to src/@ionic-native/plugins/native-storage/index.ts
diff --git a/src/@ionic-native/plugins/navigationbar/index.ts b/src/@ionic-native/plugins/navigation-bar/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/navigationbar/index.ts
rename to src/@ionic-native/plugins/navigation-bar/index.ts
diff --git a/src/@ionic-native/plugins/securestorage/index.ts b/src/@ionic-native/plugins/secure-storage/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/securestorage/index.ts
rename to src/@ionic-native/plugins/secure-storage/index.ts
diff --git a/src/@ionic-native/plugins/socialsharing/index.ts b/src/@ionic-native/plugins/social-sharing/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/socialsharing/index.ts
rename to src/@ionic-native/plugins/social-sharing/index.ts
diff --git a/src/@ionic-native/plugins/spinnerdialog/index.ts b/src/@ionic-native/plugins/spinner-dialog/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/spinnerdialog/index.ts
rename to src/@ionic-native/plugins/spinner-dialog/index.ts
diff --git a/src/@ionic-native/plugins/splashscreen/index.ts b/src/@ionic-native/plugins/splash-screen/index.ts
similarity index 83%
rename from src/@ionic-native/plugins/splashscreen/index.ts
rename to src/@ionic-native/plugins/splash-screen/index.ts
index 51629fa5c..55ac5ddcb 100644
--- a/src/@ionic-native/plugins/splashscreen/index.ts
+++ b/src/@ionic-native/plugins/splash-screen/index.ts
@@ -3,11 +3,11 @@ import { Cordova, Plugin } from '@ionic-native/core';
 
 
 /**
- * @name Splashscreen
+ * @name SplashScreen
  * @description This plugin displays and hides a splash screen during application launch. The methods below allows showing and hiding the splashscreen after the app has loaded.
  * @usage
  * ```typescript
- * import { Splashscreen } from '@ionic-native/splash-screen';
+ * import { SplashScreen } from '@ionic-native/splash-screen';
  *
  *
  * Splashscreen.show();
@@ -16,13 +16,13 @@ import { Cordova, Plugin } from '@ionic-native/core';
  * ```
  */
 @Plugin({
-  pluginName: 'Splashscreen',
+  pluginName: 'SplashScreen',
   plugin: 'cordova-plugin-splashscreen',
   pluginRef: 'navigator.splashscreen',
   repo: 'https://github.com/apache/cordova-plugin-splashscreen'
 })
 @Injectable()
-export class Splashscreen {
+export class SplashScreen {
 
   /**
    * Shows the splashscreen
diff --git a/src/@ionic-native/plugins/statusbar/index.ts b/src/@ionic-native/plugins/status-bar/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/statusbar/index.ts
rename to src/@ionic-native/plugins/status-bar/index.ts
diff --git a/src/@ionic-native/plugins/3dtouch/index.ts b/src/@ionic-native/plugins/three-dee-touch/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/3dtouch/index.ts
rename to src/@ionic-native/plugins/three-dee-touch/index.ts
diff --git a/src/@ionic-native/plugins/touchid/index.ts b/src/@ionic-native/plugins/touch-id/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/touchid/index.ts
rename to src/@ionic-native/plugins/touch-id/index.ts
diff --git a/src/@ionic-native/plugins/filetransfer/index.ts b/src/@ionic-native/plugins/transfer/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/filetransfer/index.ts
rename to src/@ionic-native/plugins/transfer/index.ts
diff --git a/src/@ionic-native/plugins/webintent/index.ts b/src/@ionic-native/plugins/web-intent/index.ts
similarity index 100%
rename from src/@ionic-native/plugins/webintent/index.ts
rename to src/@ionic-native/plugins/web-intent/index.ts