diff --git a/src/plugins/3dtouch.ts b/src/plugins/3dtouch.ts
index 53301124d..40d1fc885 100644
--- a/src/plugins/3dtouch.ts
+++ b/src/plugins/3dtouch.ts
@@ -65,7 +65,7 @@ declare var window: any;
  * ```
  */
 @Plugin({
-  name: 'ThreeDeeTouch',
+  pluginName: 'ThreeDeeTouch',
   plugin: 'cordova-plugin-3dtouch',
   pluginRef: 'ThreeDeeTouch',
   repo: 'https://github.com/EddyVerbruggen/cordova-plugin-3dtouch',
diff --git a/src/plugins/actionsheet.ts b/src/plugins/actionsheet.ts
index 03a4901c6..a6cb933f7 100644
--- a/src/plugins/actionsheet.ts
+++ b/src/plugins/actionsheet.ts
@@ -41,7 +41,7 @@ import { Cordova, Plugin } from './plugin';
  *
  */
 @Plugin({
-  name: 'ActionSheet',
+  pluginName: 'ActionSheet',
   plugin: 'cordova-plugin-actionsheet',
   pluginRef: 'plugins.actionsheet',
   repo: 'https://github.com/EddyVerbruggen/cordova-plugin-actionsheet',
diff --git a/src/plugins/admob.ts b/src/plugins/admob.ts
index b2cd1ffe4..67b8274f9 100644
--- a/src/plugins/admob.ts
+++ b/src/plugins/admob.ts
@@ -8,7 +8,7 @@ import { Observable } from 'rxjs/Observable';
  * Please refer the the plugin's original repository for detailed usage.
  */
 @Plugin({
-  name: 'AdMob',
+  pluginName: 'AdMob',
   plugin: 'cordova-plugin-admobpro',
   pluginRef: 'AdMob',
   repo: 'https://github.com/floatinghotpot/cordova-admob-pro',
diff --git a/src/plugins/android-fingerprint-auth.ts b/src/plugins/android-fingerprint-auth.ts
index 8a54fe836..e98e7e421 100644
--- a/src/plugins/android-fingerprint-auth.ts
+++ b/src/plugins/android-fingerprint-auth.ts
@@ -30,7 +30,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'AndroidFingerprintAuth',
+  pluginName: 'AndroidFingerprintAuth',
   plugin: 'cordova-plugin-android-fingerprint-auth',
   pluginRef: 'FingerprintAuth',
   repo: 'https://github.com/mjwheatley/cordova-plugin-android-fingerprint-auth'
diff --git a/src/plugins/appavailability.ts b/src/plugins/appavailability.ts
index 5461eef69..39c5e196b 100644
--- a/src/plugins/appavailability.ts
+++ b/src/plugins/appavailability.ts
@@ -28,7 +28,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'AppAvailability',
+  pluginName: 'AppAvailability',
   plugin: 'cordova-plugin-appavailability',
   pluginRef: 'appAvailability',
   repo: 'https://github.com/ohh2ahh/AppAvailability',
diff --git a/src/plugins/apprate.ts b/src/plugins/apprate.ts
index 3a902fc2c..40399dd06 100644
--- a/src/plugins/apprate.ts
+++ b/src/plugins/apprate.ts
@@ -44,7 +44,7 @@ declare var window;
 
  */
 @Plugin({
-  name: 'AppRate',
+  pluginName: 'AppRate',
   plugin: 'cordova-plugin-apprate',
   pluginRef: 'AppRate',
   repo: 'https://github.com/pushandplay/cordova-plugin-apprate',
diff --git a/src/plugins/appversion.ts b/src/plugins/appversion.ts
index 4d1e9eb43..364184f12 100644
--- a/src/plugins/appversion.ts
+++ b/src/plugins/appversion.ts
@@ -19,7 +19,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'AppVersion',
+  pluginName: 'AppVersion',
   plugin: 'cordova-plugin-app-version',
   pluginRef: 'cordova.getAppVersion',
   repo: 'https://github.com/whiteoctober/cordova-plugin-app-version',
diff --git a/src/plugins/background-geolocation.ts b/src/plugins/background-geolocation.ts
index 50252b68f..35248243b 100644
--- a/src/plugins/background-geolocation.ts
+++ b/src/plugins/background-geolocation.ts
@@ -272,7 +272,7 @@ export interface Config {
  * Config
  */
 @Plugin({
-  name: 'BackgroundGeolocation',
+  pluginName: 'BackgroundGeolocation',
   plugin: 'cordova-plugin-mauron85-background-geolocation',
   pluginRef: 'backgroundGeolocation',
   repo: 'https://github.com/mauron85/cordova-plugin-background-geolocation',
diff --git a/src/plugins/backgroundmode.ts b/src/plugins/backgroundmode.ts
index fd8d41c85..04fc99eed 100644
--- a/src/plugins/backgroundmode.ts
+++ b/src/plugins/backgroundmode.ts
@@ -28,7 +28,7 @@ import { Observable } from 'rxjs/Observable';
 *
 */
 @Plugin({
-  name: 'BackgroundMode',
+  pluginName: 'BackgroundMode',
   plugin: 'cordova-plugin-background-mode',
   pluginRef: 'cordova.plugins.backgroundMode',
   repo: 'https://github.com/katzer/cordova-plugin-background-mode',
diff --git a/src/plugins/badge.ts b/src/plugins/badge.ts
index 0809219b9..950124322 100644
--- a/src/plugins/badge.ts
+++ b/src/plugins/badge.ts
@@ -18,7 +18,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'Badge',
+  pluginName: 'Badge',
   plugin: 'cordova-plugin-badge',
   pluginRef: 'cordova.plugins.notification.badge',
   repo: 'https://github.com/katzer/cordova-plugin-badge',
diff --git a/src/plugins/barcodescanner.ts b/src/plugins/barcodescanner.ts
index 48ed1a3ed..ae1656dfc 100644
--- a/src/plugins/barcodescanner.ts
+++ b/src/plugins/barcodescanner.ts
@@ -20,7 +20,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'BarcodeScanner',
+  pluginName: 'BarcodeScanner',
   plugin: 'phonegap-plugin-barcodescanner',
   pluginRef: 'cordova.plugins.barcodeScanner',
   repo: 'https://github.com/phonegap/phonegap-plugin-barcodescanner',
diff --git a/src/plugins/base64togallery.ts b/src/plugins/base64togallery.ts
index 895f623d7..035182274 100644
--- a/src/plugins/base64togallery.ts
+++ b/src/plugins/base64togallery.ts
@@ -14,7 +14,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'Base64ToGallery',
+  pluginName: 'Base64ToGallery',
   plugin: 'cordova-base64-to-gallery',
   pluginRef: 'cordova',
   repo: 'https://github.com/Nexxa/cordova-base64-to-gallery',
diff --git a/src/plugins/batterystatus.ts b/src/plugins/batterystatus.ts
index 64f9a1cb3..6526cc30e 100644
--- a/src/plugins/batterystatus.ts
+++ b/src/plugins/batterystatus.ts
@@ -24,7 +24,7 @@ import { Observable } from 'rxjs/Observable';
  * ```
  */
 @Plugin({
-  name: 'BatteryStatus',
+  pluginName: 'BatteryStatus',
   plugin: 'cordova-plugin-battery-status',
   repo: 'https://github.com/apache/cordova-plugin-battery-status',
   platforms: ['Amazon Fire OS', 'iOS', 'Android', 'BlackBerry 10', 'Windows Phone 7', 'Windows Phone 8', 'Windows', 'Firefox OS', 'Browser']
diff --git a/src/plugins/ble.ts b/src/plugins/ble.ts
index 81331ce67..9c776f1f0 100644
--- a/src/plugins/ble.ts
+++ b/src/plugins/ble.ts
@@ -160,7 +160,7 @@ import { Observable } from 'rxjs/Observable';
  *
  */
 @Plugin({
-  name: 'BLE',
+  pluginName: 'BLE',
   plugin: 'cordova-plugin-ble-central',
   pluginRef: 'ble',
   repo: 'https://github.com/don/cordova-plugin-ble-central',
diff --git a/src/plugins/bluetoothserial.ts b/src/plugins/bluetoothserial.ts
index 49b8b7344..82809e66b 100644
--- a/src/plugins/bluetoothserial.ts
+++ b/src/plugins/bluetoothserial.ts
@@ -28,7 +28,7 @@ import { Observable } from 'rxjs/Observable';
  * ```
  */
 @Plugin({
-  name: 'BluetoothSerial',
+  pluginName: 'BluetoothSerial',
   repo: 'https://github.com/don/BluetoothSerial',
   plugin: 'cordova-plugin-bluetooth-serial',
   pluginRef: 'bluetoothSerial',
diff --git a/src/plugins/brightness.ts b/src/plugins/brightness.ts
index 15ef6e153..8a5d7b228 100644
--- a/src/plugins/brightness.ts
+++ b/src/plugins/brightness.ts
@@ -18,7 +18,7 @@ import { Cordova, Plugin } from './plugin';
  *
  */
 @Plugin({
-  name: 'Brightness',
+  pluginName: 'Brightness',
   plugin: 'cordova-plugin-brightness',
   pluginRef: 'cordova.plugins.brightness',
   repo: 'https://github.com/mgcrea/cordova-plugin-brightness',
diff --git a/src/plugins/calendar.ts b/src/plugins/calendar.ts
index ddaf69028..b389c8cd9 100644
--- a/src/plugins/calendar.ts
+++ b/src/plugins/calendar.ts
@@ -38,7 +38,7 @@ export interface CalendarOptions {
  *
  */
 @Plugin({
-  name: 'Calendar',
+  pluginName: 'Calendar',
   plugin: 'cordova-plugin-calendar',
   pluginRef: 'plugins.calendar',
   repo: 'https://github.com/EddyVerbruggen/Calendar-PhoneGap-Plugin',
diff --git a/src/plugins/call-number.ts b/src/plugins/call-number.ts
index 281a91ffb..06367432b 100644
--- a/src/plugins/call-number.ts
+++ b/src/plugins/call-number.ts
@@ -16,7 +16,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'CallNumber',
+  pluginName: 'CallNumber',
   plugin: 'call-number',
   pluginRef: 'plugins.CallNumber',
   repo: 'https://github.com/Rohfosho/CordovaCallNumberPlugin',
diff --git a/src/plugins/camera-preview.ts b/src/plugins/camera-preview.ts
index a47ca50d8..1dac77910 100644
--- a/src/plugins/camera-preview.ts
+++ b/src/plugins/camera-preview.ts
@@ -69,7 +69,7 @@ export interface CameraPreviewSize {
  *
  */
 @Plugin({
-  name: 'CameraPreview',
+  pluginName: 'CameraPreview',
   plugin: 'cordova-plugin-camera-preview',
   pluginRef: 'cordova.plugins.camerapreview',
   repo: 'https://github.com/westonganger/cordova-plugin-camera-preview',
diff --git a/src/plugins/camera.ts b/src/plugins/camera.ts
index a892e9eec..2942162fd 100644
--- a/src/plugins/camera.ts
+++ b/src/plugins/camera.ts
@@ -110,7 +110,7 @@ export interface CameraPopoverOptions {
  * CameraPopoverOptions
  */
 @Plugin({
-  name: 'Camera',
+  pluginName: 'Camera',
   plugin: 'cordova-plugin-camera',
   pluginRef: 'navigator.camera',
   repo: 'https://github.com/apache/cordova-plugin-camera',
diff --git a/src/plugins/card-io.ts b/src/plugins/card-io.ts
index 4d390d7f4..3e5a2b722 100644
--- a/src/plugins/card-io.ts
+++ b/src/plugins/card-io.ts
@@ -25,7 +25,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'CardIO',
+  pluginName: 'CardIO',
   plugin: 'https://github.com/card-io/card.io-Cordova-Plugin',
   pluginRef: 'CardIO',
   repo: 'https://github.com/card-io/card.io-Cordova-Plugin',
diff --git a/src/plugins/clipboard.ts b/src/plugins/clipboard.ts
index ae83a3063..4443e99c0 100644
--- a/src/plugins/clipboard.ts
+++ b/src/plugins/clipboard.ts
@@ -28,7 +28,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'Clipboard',
+  pluginName: 'Clipboard',
   plugin: 'https://github.com/VersoSolutions/CordovaClipboard.git',
   pluginRef: 'cordova.plugins.clipboard',
   repo: 'https://github.com/VersoSolutions/CordovaClipboard',
diff --git a/src/plugins/code-push.ts b/src/plugins/code-push.ts
index 4808423ad..7990dc9e7 100644
--- a/src/plugins/code-push.ts
+++ b/src/plugins/code-push.ts
@@ -420,7 +420,7 @@ export interface DownloadProgress {
  * ```
  */
 @Plugin({
-  name: 'CodePush',
+  pluginName: 'CodePush',
   plugin: 'cordova-plugin-code-push',
   pluginRef: 'codePush',
   repo: 'https://github.com/Microsoft/cordova-plugin-code-push',
diff --git a/src/plugins/contacts.ts b/src/plugins/contacts.ts
index e355b6066..8648b032a 100644
--- a/src/plugins/contacts.ts
+++ b/src/plugins/contacts.ts
@@ -316,7 +316,7 @@ export class ContactFindOptions implements IContactFindOptions {
  * ContactAddress
  */
 @Plugin({
-  name: 'Contacts',
+  pluginName: 'Contacts',
   plugin: 'cordova-plugin-contacts',
   pluginRef: 'navigator.contacts',
   repo: 'https://github.com/apache/cordova-plugin-contacts'
diff --git a/src/plugins/crop.ts b/src/plugins/crop.ts
index 4c0e7336e..8d5887111 100644
--- a/src/plugins/crop.ts
+++ b/src/plugins/crop.ts
@@ -16,7 +16,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'Crop',
+  pluginName: 'Crop',
   plugin: 'cordova-plugin-crop',
   pluginRef: 'plugins',
   repo: 'https://github.com/jeduan/cordova-plugin-crop'
diff --git a/src/plugins/datepicker.ts b/src/plugins/datepicker.ts
index 5a991fb56..22ce9473c 100644
--- a/src/plugins/datepicker.ts
+++ b/src/plugins/datepicker.ts
@@ -128,7 +128,7 @@ export interface DatePickerOptions {
  * DatePickerOptions
  */
 @Plugin({
-  name: 'DatePicker',
+  pluginName: 'DatePicker',
   plugin: 'cordova-plugin-datepicker',
   pluginRef: 'datePicker',
   repo: 'https://github.com/VitaliiBlagodir/cordova-plugin-datepicker'
diff --git a/src/plugins/dbmeter.ts b/src/plugins/dbmeter.ts
index 907dded42..ef85709fe 100644
--- a/src/plugins/dbmeter.ts
+++ b/src/plugins/dbmeter.ts
@@ -31,7 +31,7 @@ import { Observable } from 'rxjs/Observable';
  * ```
  */
 @Plugin({
-  name: 'DBMeter',
+  pluginName: 'DBMeter',
   plugin: 'cordova-plugin-dbmeter',
   pluginRef: 'DBMeter',
   repo: 'https://github.com/akofman/cordova-plugin-dbmeter',
diff --git a/src/plugins/deeplinks.ts b/src/plugins/deeplinks.ts
index 103474aea..09c66712a 100644
--- a/src/plugins/deeplinks.ts
+++ b/src/plugins/deeplinks.ts
@@ -59,7 +59,7 @@ export interface DeeplinkMatch {
  * retrieve the `NavController` reference at runtime.
  */
 @Plugin({
-  name: 'Deeplinks',
+  pluginName: 'Deeplinks',
   plugin: 'ionic-plugin-deeplinks',
   pluginRef: 'IonicDeeplink',
   repo: 'https://github.com/driftyco/ionic-plugin-deeplinks',
diff --git a/src/plugins/device-feedback.ts b/src/plugins/device-feedback.ts
index 20b1f3d55..f8274be88 100644
--- a/src/plugins/device-feedback.ts
+++ b/src/plugins/device-feedback.ts
@@ -25,7 +25,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'DeviceFeedback',
+  pluginName: 'DeviceFeedback',
   plugin: 'cordova-plugin-velda-devicefeedback',
   pluginRef: 'plugins.deviceFeedback',
   repo: 'https://github.com/VVelda/device-feedback',
diff --git a/src/plugins/device.ts b/src/plugins/device.ts
index 01d07cd23..49a0beb0a 100644
--- a/src/plugins/device.ts
+++ b/src/plugins/device.ts
@@ -41,7 +41,7 @@ export interface Device {
  * ```
  */
 @Plugin({
-  name: 'Device',
+  pluginName: 'Device',
   plugin: 'cordova-plugin-device',
   pluginRef: 'device',
   repo: 'https://github.com/apache/cordova-plugin-device'
diff --git a/src/plugins/deviceaccounts.ts b/src/plugins/deviceaccounts.ts
index c7392b573..90a413676 100644
--- a/src/plugins/deviceaccounts.ts
+++ b/src/plugins/deviceaccounts.ts
@@ -2,7 +2,7 @@ import { Cordova, Plugin } from './plugin';
 
 
 @Plugin({
-  name: 'DeviceAccounts',
+  pluginName: 'DeviceAccounts',
   plugin: 'https://github.com/loicknuchel/cordova-device-accounts.git',
   pluginRef: 'plugins.DeviceAccounts',
   repo: 'https://github.com/loicknuchel/cordova-device-accounts',
diff --git a/src/plugins/devicemotion.ts b/src/plugins/devicemotion.ts
index 025912f83..27dddabd6 100644
--- a/src/plugins/devicemotion.ts
+++ b/src/plugins/devicemotion.ts
@@ -62,7 +62,7 @@ export interface AccelerometerOptions {
  * ```
  */
 @Plugin({
-  name: 'DeviceMotion',
+  pluginName: 'DeviceMotion',
   plugin: 'cordova-plugin-device-motion',
   pluginRef: 'navigator.accelerometer',
   repo: 'https://github.com/apache/cordova-plugin-device-motion'
diff --git a/src/plugins/deviceorientation.ts b/src/plugins/deviceorientation.ts
index 1d5b247a9..8bae29652 100644
--- a/src/plugins/deviceorientation.ts
+++ b/src/plugins/deviceorientation.ts
@@ -67,7 +67,7 @@ export interface CompassOptions {
  * ```
  */
 @Plugin({
-  name: 'DeviceOrientation',
+  pluginName: 'DeviceOrientation',
   plugin: 'cordova-plugin-device-orientation',
   pluginRef: 'navigator.compass',
   repo: 'https://github.com/apache/cordova-plugin-device-orientation'
diff --git a/src/plugins/diagnostic.ts b/src/plugins/diagnostic.ts
index 81148577d..bac1ba937 100644
--- a/src/plugins/diagnostic.ts
+++ b/src/plugins/diagnostic.ts
@@ -29,7 +29,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'Diagnostic',
+  pluginName: 'Diagnostic',
   plugin: 'cordova.plugins.diagnostic',
   pluginRef: 'cordova.plugins.diagnostic',
   repo: 'https://github.com/dpa99c/cordova-diagnostic-plugin'
diff --git a/src/plugins/dialogs.ts b/src/plugins/dialogs.ts
index 17effc154..3f92678e5 100644
--- a/src/plugins/dialogs.ts
+++ b/src/plugins/dialogs.ts
@@ -32,7 +32,7 @@ export interface PromptCallback {
  * ```
  */
 @Plugin({
-  name: 'Dialogs',
+  pluginName: 'Dialogs',
   plugin: 'cordova-plugin-dialogs',
   pluginRef: 'navigator.notification',
   repo: 'https://github.com/apache/cordova-plugin-dialogs.git'
diff --git a/src/plugins/emailcomposer.ts b/src/plugins/emailcomposer.ts
index f396a5604..781b93b1a 100644
--- a/src/plugins/emailcomposer.ts
+++ b/src/plugins/emailcomposer.ts
@@ -44,7 +44,7 @@ declare var cordova: any;
  * ```
  */
 @Plugin({
-  name: 'EmailComposer',
+  pluginName: 'EmailComposer',
   plugin: 'cordova-plugin-email',
   pluginRef: 'cordova.plugins.email',
   repo: 'https://github.com/hypery2k/cordova-email-plugin',
diff --git a/src/plugins/estimote-beacons.ts b/src/plugins/estimote-beacons.ts
index 07d42d6fa..567b6a083 100644
--- a/src/plugins/estimote-beacons.ts
+++ b/src/plugins/estimote-beacons.ts
@@ -9,7 +9,7 @@ import { Observable } from 'rxjs/Observable';
  *
  */
 @Plugin({
-  name: 'EstimoteBeacons',
+  pluginName: 'EstimoteBeacons',
   plugin: 'cordova-plugin-estimote',
   pluginRef: 'estimote.beacons',
   repo: 'https://github.com/evothings/phonegap-estimotebeacons',
diff --git a/src/plugins/facebook.ts b/src/plugins/facebook.ts
index 41e982db7..a241b2d7d 100644
--- a/src/plugins/facebook.ts
+++ b/src/plugins/facebook.ts
@@ -78,7 +78,7 @@ import { Cordova, Plugin } from './plugin';
  *
  */
 @Plugin({
-  name: 'Facebook',
+  pluginName: 'Facebook',
   plugin: 'cordova-plugin-facebook4',
   pluginRef: 'facebookConnectPlugin',
   repo: 'https://github.com/jeduan/cordova-plugin-facebook4',
diff --git a/src/plugins/file-chooser.ts b/src/plugins/file-chooser.ts
index 8fa42e704..16ea5ab87 100644
--- a/src/plugins/file-chooser.ts
+++ b/src/plugins/file-chooser.ts
@@ -16,7 +16,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'FileChooser',
+  pluginName: 'FileChooser',
   plugin: 'http://github.com/don/cordova-filechooser.git',
   pluginRef: 'fileChooser',
   repo: 'https://github.com/don/cordova-filechooser',
diff --git a/src/plugins/file-opener.ts b/src/plugins/file-opener.ts
index 03d034028..4a113c049 100644
--- a/src/plugins/file-opener.ts
+++ b/src/plugins/file-opener.ts
@@ -13,7 +13,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'FileOpener',
+  pluginName: 'FileOpener',
   plugin: 'cordova-plugin-file-opener2',
   pluginRef: 'cordova.plugins.fileOpener2',
   repo: 'https://github.com/pwlin/cordova-plugin-file-opener2'
diff --git a/src/plugins/file.ts b/src/plugins/file.ts
index 1af744db7..d38ac8dec 100644
--- a/src/plugins/file.ts
+++ b/src/plugins/file.ts
@@ -360,7 +360,7 @@ declare var FileError: {
  *  It also implements the FileWriter spec : http://dev.w3.org/2009/dap/file-system/file-writer.html
  */
 @Plugin({
-  name: 'File',
+  pluginName: 'File',
   plugin: 'cordova-plugin-file',
   pluginRef: 'cordova.file',
   repo: 'https://github.com/apache/cordova-plugin-file'
@@ -391,7 +391,7 @@ export class File {
     return new Promise<any>((resolve, reject) => {
       if (!cordova || !cordova.exec) {
         pluginWarn({
-          name: 'File',
+          pluginName: 'File',
           plugin: 'cordova-plugin-file'
         });
         reject({ error: 'plugin_not_installed' });
diff --git a/src/plugins/filepath.ts b/src/plugins/filepath.ts
index 44957ae6f..129c770f6 100644
--- a/src/plugins/filepath.ts
+++ b/src/plugins/filepath.ts
@@ -19,7 +19,7 @@ declare var window: any;
  * ```
  */
 @Plugin({
-  name: 'FilePath',
+  pluginName: 'FilePath',
   plugin: 'cordova-plugin-filepath',
   pluginRef: 'window.FilePath',
   repo: 'https://github.com/hiddentao/cordova-plugin-filepath',
diff --git a/src/plugins/filetransfer.ts b/src/plugins/filetransfer.ts
index 334d67095..6b397a4c0 100644
--- a/src/plugins/filetransfer.ts
+++ b/src/plugins/filetransfer.ts
@@ -173,7 +173,7 @@ export interface FileTransferError {
  * ```
  */
 @Plugin({
-  name: 'FileTransfer',
+  pluginName: 'FileTransfer',
   plugin: 'cordova-plugin-file-transfer',
   pluginRef: 'FileTransfer',
   repo: 'https://github.com/apache/cordova-plugin-file-transfer'
diff --git a/src/plugins/flashlight.ts b/src/plugins/flashlight.ts
index 7c325b46c..a2fad261e 100644
--- a/src/plugins/flashlight.ts
+++ b/src/plugins/flashlight.ts
@@ -16,7 +16,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'Flashlight',
+  pluginName: 'Flashlight',
   plugin: 'cordova-plugin-flashlight',
   pluginRef: 'window.plugins.flashlight',
   repo: 'https://github.com/EddyVerbruggen/Flashlight-PhoneGap-Plugin.git'
diff --git a/src/plugins/geofence.ts b/src/plugins/geofence.ts
index 436ad13a0..b9727829d 100644
--- a/src/plugins/geofence.ts
+++ b/src/plugins/geofence.ts
@@ -74,7 +74,7 @@ import { Observable } from 'rxjs/Observable';
 declare var window: any;
 
 @Plugin({
-  name: 'Geofence',
+  pluginName: 'Geofence',
   plugin: 'cordova-plugin-geofence',
   pluginRef: 'geofence',
   repo: 'https://github.com/cowbell/cordova-plugin-geofence/',
diff --git a/src/plugins/geolocation.ts b/src/plugins/geolocation.ts
index 9e57a72b8..3c0794d65 100644
--- a/src/plugins/geolocation.ts
+++ b/src/plugins/geolocation.ts
@@ -139,7 +139,7 @@ export interface GeolocationOptions {
  * GeolocationOptions
  */
 @Plugin({
-  name: 'Geolocation',
+  pluginName: 'Geolocation',
   plugin: 'cordova-plugin-geolocation',
   pluginRef: 'navigator.geolocation',
   repo: 'https://github.com/apache/cordova-plugin-geolocation'
diff --git a/src/plugins/globalization.ts b/src/plugins/globalization.ts
index 52e3586f2..172ba6c67 100644
--- a/src/plugins/globalization.ts
+++ b/src/plugins/globalization.ts
@@ -11,7 +11,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'Globalization',
+  pluginName: 'Globalization',
   plugin: 'cordova-plugin-globalization',
   pluginRef: 'navigator.globalization',
   repo: 'https://github.com/apache/cordova-plugin-globalization'
diff --git a/src/plugins/google-plus.ts b/src/plugins/google-plus.ts
index 63c0957f8..633828c8c 100644
--- a/src/plugins/google-plus.ts
+++ b/src/plugins/google-plus.ts
@@ -12,7 +12,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'GooglePlus',
+  pluginName: 'GooglePlus',
   plugin: 'cordova-plugin-googleplus',
   pluginRef: 'window.plugins.googleplus',
   repo: 'https://github.com/EddyVerbruggen/cordova-plugin-googleplus',
diff --git a/src/plugins/googleanalytics.ts b/src/plugins/googleanalytics.ts
index 2ab94af0b..79b1161ae 100644
--- a/src/plugins/googleanalytics.ts
+++ b/src/plugins/googleanalytics.ts
@@ -13,7 +13,7 @@ declare var window;
  * - (Android) Google Play Services SDK installed via [Android SDK Manager](https://developer.android.com/sdk/installing/adding-packages.html)
  */
 @Plugin({
-  name: 'GoogleAnalytics',
+  pluginName: 'GoogleAnalytics',
   plugin: 'cordova-plugin-google-analytics',
   pluginRef: 'ga',
   repo: 'https://github.com/danwilson/google-analytics-plugin',
diff --git a/src/plugins/googlemap.ts b/src/plugins/googlemap.ts
index aa71a35bf..33a08d3e6 100644
--- a/src/plugins/googlemap.ts
+++ b/src/plugins/googlemap.ts
@@ -84,7 +84,7 @@ export const GoogleMapsAnimation = {
  * ```
  */
 @Plugin({
-  name: 'GoogleMap',
+  pluginName: 'GoogleMap',
   pluginRef: 'plugin.google.maps.Map',
   plugin: 'cordova-plugin-googlemaps',
   repo: 'https://github.com/mapsplugin/cordova-plugin-googlemaps',
@@ -109,7 +109,7 @@ export class GoogleMap {
       this._objectInstance = plugin.google.maps.Map.getMap(element, options);
     } else {
       pluginWarn({
-        name: 'GoogleMap',
+        pluginName: 'GoogleMap',
         plugin: 'plugin.google.maps.Map'
       });
     }
@@ -982,7 +982,7 @@ export class Geocoder {
     return new Promise<GeocoderResult[]>((resolve, reject) => {
       if (!plugin || !plugin.google || !plugin.google.maps || !plugin.google.maps.Geocoder) {
         pluginWarn({
-          name: 'GoogleMap',
+          pluginName: 'GoogleMap',
           plugin: 'plugin.google.maps.Map'
         });
         reject({ error: 'plugin_not_installed' });
diff --git a/src/plugins/hotspot.ts b/src/plugins/hotspot.ts
index eb4fcb418..f8d9a5511 100644
--- a/src/plugins/hotspot.ts
+++ b/src/plugins/hotspot.ts
@@ -15,7 +15,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'Hotspot',
+  pluginName: 'Hotspot',
   plugin: 'cordova-plugin-hotspot',
   pluginRef: 'cordova.plugins.hotspot',
   repo: 'https://github.com/hypery2k/cordova-hotspot-plugin',
diff --git a/src/plugins/http.ts b/src/plugins/http.ts
index a3df55021..6ab4af479 100644
--- a/src/plugins/http.ts
+++ b/src/plugins/http.ts
@@ -33,7 +33,7 @@ import { Plugin, Cordova } from './plugin';
  * HTTPResponse
  */
 @Plugin({
-  name: 'HTTP',
+  pluginName: 'HTTP',
   plugin: 'cordova-plugin-http',
   pluginRef: 'cordovaHTTP',
   repo: 'https://github.com/wymsee/cordova-HTTP',
diff --git a/src/plugins/httpd.ts b/src/plugins/httpd.ts
index 3c09f6602..2d0f322e3 100644
--- a/src/plugins/httpd.ts
+++ b/src/plugins/httpd.ts
@@ -23,7 +23,7 @@ import { Observable } from 'rxjs/Observable';
  * ```
  */
 @Plugin({
-  name: 'Httpd',
+  pluginName: 'Httpd',
   plugin: 'https://github.com/floatinghotpot/cordova-httpd.git',
   pluginRef: 'cordova.plugins.CorHttpd',
   repo: 'https://github.com/floatinghotpot/cordova-httpd',
diff --git a/src/plugins/ibeacon.ts b/src/plugins/ibeacon.ts
index f5c178832..7f12553c9 100644
--- a/src/plugins/ibeacon.ts
+++ b/src/plugins/ibeacon.ts
@@ -268,7 +268,7 @@ export interface Delegate {
  * ```
  */
 @Plugin({
-  name: 'IBeacon',
+  pluginName: 'IBeacon',
   plugin: 'cordova-plugin-ibeacon',
   pluginRef: 'cordova.plugins.locationManager',
   repo: 'https://github.com/petermetz/cordova-plugin-ibeacon',
diff --git a/src/plugins/imagepicker.ts b/src/plugins/imagepicker.ts
index d63216de5..14539543e 100644
--- a/src/plugins/imagepicker.ts
+++ b/src/plugins/imagepicker.ts
@@ -46,7 +46,7 @@ export interface ImagePickerOptions {
  * ImagePickerOptions
  */
 @Plugin({
-  name: 'ImagePicker',
+  pluginName: 'ImagePicker',
   plugin: 'cordova-plugin-image-picker',
   pluginRef: 'window.imagePicker',
   repo: 'https://github.com/wymsee/cordova-imagePicker'
diff --git a/src/plugins/imageresizer.ts b/src/plugins/imageresizer.ts
index 6bee4bd4f..382c11e8f 100644
--- a/src/plugins/imageresizer.ts
+++ b/src/plugins/imageresizer.ts
@@ -67,7 +67,7 @@ export interface ImageResizerOptions {
  * ```
  */
 @Plugin({
-  name: 'ImageResizer',
+  pluginName: 'ImageResizer',
   plugin: 'https://github.com/protonet/cordova-plugin-image-resizer.git',
   pluginRef: 'ImageResizer',
   repo: 'https://github.com/protonet/cordova-plugin-image-resizer'
diff --git a/src/plugins/inappbrowser.ts b/src/plugins/inappbrowser.ts
index e50b3e8f9..3a82707a0 100644
--- a/src/plugins/inappbrowser.ts
+++ b/src/plugins/inappbrowser.ts
@@ -31,7 +31,7 @@ export interface InAppBrowserEvent extends Event {
  * ```
  */
 @Plugin({
-  name: 'InAppBrowser',
+  pluginName: 'InAppBrowser',
   plugin: 'cordova-plugin-inappbrowser',
   pluginRef: 'cordova.InAppBrowser',
   repo: 'https://github.com/apache/cordova-plugin-inappbrowser'
diff --git a/src/plugins/inapppurchase.ts b/src/plugins/inapppurchase.ts
index 701e2ca1e..874970148 100644
--- a/src/plugins/inapppurchase.ts
+++ b/src/plugins/inapppurchase.ts
@@ -51,7 +51,7 @@ import { Plugin, Cordova } from './plugin';
  *
  */
 @Plugin({
-  name: 'InAppPurchase',
+  pluginName: 'InAppPurchase',
   plugin: 'cordova-plugin-inapppurchase',
   pluginRef: 'inAppPurchase',
   platforms: ['Android', 'iOS'],
diff --git a/src/plugins/insomnia.ts b/src/plugins/insomnia.ts
index ba46e0ff2..1fde35b18 100644
--- a/src/plugins/insomnia.ts
+++ b/src/plugins/insomnia.ts
@@ -26,7 +26,7 @@ import { Cordova, Plugin } from './plugin';
  *
  */
 @Plugin({
-  name: 'Insomnia',
+  pluginName: 'Insomnia',
   plugin: 'https://github.com/EddyVerbruggen/Insomnia-PhoneGap-Plugin.git',
   pluginRef: 'plugins.insomnia',
   repo: 'https://github.com/EddyVerbruggen/Insomnia-PhoneGap-Plugin',
diff --git a/src/plugins/instagram.ts b/src/plugins/instagram.ts
index f045d6698..9680acc0f 100644
--- a/src/plugins/instagram.ts
+++ b/src/plugins/instagram.ts
@@ -15,7 +15,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'Instagram',
+  pluginName: 'Instagram',
   plugin: 'cordova-instagram-plugin',
   pluginRef: 'Instagram',
   repo: 'https://github.com/vstirbu/InstagramPlugin'
diff --git a/src/plugins/is-debug.ts b/src/plugins/is-debug.ts
index d04447cf2..25f1ab51b 100644
--- a/src/plugins/is-debug.ts
+++ b/src/plugins/is-debug.ts
@@ -17,7 +17,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'IsDebug',
+  pluginName: 'IsDebug',
   plugin: 'cordova-plugin-is-debug',
   pluginRef: 'cordova.plugins.IsDebug',
   repo: 'https://github.com/mattlewis92/cordova-plugin-is-debug'
diff --git a/src/plugins/keyboard.ts b/src/plugins/keyboard.ts
index f1998a916..8be9b2d36 100644
--- a/src/plugins/keyboard.ts
+++ b/src/plugins/keyboard.ts
@@ -14,7 +14,7 @@ import { Observable } from 'rxjs/Observable';
  * ```
  */
 @Plugin({
-  name: 'Keyboard',
+  pluginName: 'Keyboard',
   plugin: 'ionic-plugin-keyboard',
   pluginRef: 'cordova.plugins.Keyboard',
   repo: 'https://github.com/driftyco/ionic-plugin-keyboard'
diff --git a/src/plugins/launchnavigator.ts b/src/plugins/launchnavigator.ts
index 5746151aa..b3bc546e7 100644
--- a/src/plugins/launchnavigator.ts
+++ b/src/plugins/launchnavigator.ts
@@ -82,7 +82,7 @@ export interface LaunchNavigatorOptions {
  * ```
  */
 @Plugin({
-  name: 'LaunchNavigator',
+  pluginName: 'LaunchNavigator',
   plugin: 'uk.co.workingedge.phonegap.plugin.launchnavigator',
   pluginRef: 'launchnavigator',
   repo: 'https://github.com/dpa99c/phonegap-launch-navigator.git'
diff --git a/src/plugins/localnotifications.ts b/src/plugins/localnotifications.ts
index d60c0d2d1..d6f517a01 100644
--- a/src/plugins/localnotifications.ts
+++ b/src/plugins/localnotifications.ts
@@ -45,7 +45,7 @@ import { Cordova, Plugin } from './plugin';
  *
  */
 @Plugin({
-  name: 'LocalNotifications',
+  pluginName: 'LocalNotifications',
   plugin: 'de.appplant.cordova.plugin.local-notification',
   pluginRef: 'cordova.plugins.notification.local',
   repo: 'https://github.com/katzer/cordova-plugin-local-notifications'
diff --git a/src/plugins/location-accuracy.ts b/src/plugins/location-accuracy.ts
index 098642404..c56a74c96 100644
--- a/src/plugins/location-accuracy.ts
+++ b/src/plugins/location-accuracy.ts
@@ -23,7 +23,7 @@ import {Plugin, Cordova} from './plugin';
  * ```
  */
 @Plugin({
-  name: 'LocationAccuracy',
+  pluginName: 'LocationAccuracy',
   plugin: 'cordova-plugin-request-location-accuracy',
   pluginRef: 'cordova.plugins.locationAccuracy',
   repo: 'https://github.com/dpa99c/cordova-plugin-request-location-accuracy'
diff --git a/src/plugins/market.ts b/src/plugins/market.ts
index 0ba60687e..70a97bca4 100644
--- a/src/plugins/market.ts
+++ b/src/plugins/market.ts
@@ -13,7 +13,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'Market',
+  pluginName: 'Market',
   plugin: 'cordova-plugin-market',
   pluginRef: 'plugins.market',
   repo: 'https://github.com/xmartlabs/cordova-plugin-market'
diff --git a/src/plugins/media-capture.ts b/src/plugins/media-capture.ts
index f2aba7160..de3126789 100644
--- a/src/plugins/media-capture.ts
+++ b/src/plugins/media-capture.ts
@@ -22,7 +22,7 @@ declare var navigator: any;
  * ```
  */
 @Plugin({
-  name: 'MediaCapture',
+  pluginName: 'MediaCapture',
   plugin: 'cordova-plugin-media-capture',
   pluginRef: 'navigator.device.capture',
   repo: 'https://github.com/apache/cordova-plugin-media-capture'
diff --git a/src/plugins/media.ts b/src/plugins/media.ts
index ae23d60ea..eb05933c1 100644
--- a/src/plugins/media.ts
+++ b/src/plugins/media.ts
@@ -68,7 +68,7 @@ export interface MediaError {
  * ```
  */
 @Plugin({
-  name: 'MediaPlugin',
+  pluginName: 'MediaPlugin',
   repo: 'https://github.com/apache/cordova-plugin-media',
   plugin: 'cordova-plugin-media',
   pluginRef: 'Media'
@@ -132,7 +132,7 @@ export class MediaPlugin {
       });
     } else {
       pluginWarn({
-        name: 'MediaPlugin',
+        pluginName: 'MediaPlugin',
         plugin: 'cordova-plugin-media'
       });
     }
diff --git a/src/plugins/mixpanel.ts b/src/plugins/mixpanel.ts
index 1550bbe57..972c6dd4b 100644
--- a/src/plugins/mixpanel.ts
+++ b/src/plugins/mixpanel.ts
@@ -18,7 +18,7 @@ declare var mixpanel: any;
  * ```
  */
 @Plugin({
-  name: 'Mixpanel',
+  pluginName: 'Mixpanel',
   plugin: 'cordova-plugin-mixpanel',
   pluginRef: 'mixpanel',
   repo: 'https://github.com/samzilverberg/cordova-mixpanel-plugin'
diff --git a/src/plugins/music-controls.ts b/src/plugins/music-controls.ts
index cddd6be00..baf4718e9 100644
--- a/src/plugins/music-controls.ts
+++ b/src/plugins/music-controls.ts
@@ -73,7 +73,7 @@ import { Observable } from 'rxjs/Observable';
  * ```
  */
 @Plugin({
-  name: 'MusicControls',
+  pluginName: 'MusicControls',
   plugin: 'cordova-plugin-music-controls',
   pluginRef: 'MusicControls',
   repo: 'https://github.com/homerours/cordova-music-controls-plugin'
diff --git a/src/plugins/native-audio.ts b/src/plugins/native-audio.ts
index 58485763f..11588ec77 100644
--- a/src/plugins/native-audio.ts
+++ b/src/plugins/native-audio.ts
@@ -21,7 +21,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'NativeAudio',
+  pluginName: 'NativeAudio',
   plugin: 'cordova-plugin-nativeaudio',
   pluginRef: 'plugins.NativeAudio',
   repo: 'https://github.com/floatinghotpot/cordova-plugin-nativeaudio'
diff --git a/src/plugins/native-page-transitions.ts b/src/plugins/native-page-transitions.ts
index 7020e0114..0783c7d48 100644
--- a/src/plugins/native-page-transitions.ts
+++ b/src/plugins/native-page-transitions.ts
@@ -27,7 +27,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'NativePageTransitions',
+  pluginName: 'NativePageTransitions',
   plugin: 'com.telerik.plugins.nativepagetransitions',
   pluginRef: 'plugins.nativepagetransitions',
   repo: 'https://github.com/Telerik-Verified-Plugins/NativePageTransitions',
diff --git a/src/plugins/nativestorage.ts b/src/plugins/nativestorage.ts
index f4ee84108..6da71c445 100644
--- a/src/plugins/nativestorage.ts
+++ b/src/plugins/nativestorage.ts
@@ -23,7 +23,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'NativeStorage',
+  pluginName: 'NativeStorage',
   plugin: 'cordova-plugin-nativestorage',
   pluginRef: 'NativeStorage',
   repo: 'https://github.com/TheCocoaProject/cordova-plugin-nativestorage'
diff --git a/src/plugins/network.ts b/src/plugins/network.ts
index 964b4e501..cf0ad673d 100644
--- a/src/plugins/network.ts
+++ b/src/plugins/network.ts
@@ -43,7 +43,7 @@ declare var navigator: any;
  * The `connection` property will return one of the following connection types: `unknown`, `ethernet`, `wifi`, `2g`, `3g`, `4g`, `cellular`, `none`
  */
 @Plugin({
-  name: 'Network',
+  pluginName: 'Network',
   plugin: 'cordova-plugin-network-information',
   repo: 'https://github.com/apache/cordova-plugin-network-information',
   platforms: ['Amazon Fire OS', 'iOS', 'Android', 'BlackBerry 10', 'Windows Phone 7', 'Windows Phone 8', 'Windows', 'Firefox OS', 'Browser'],
diff --git a/src/plugins/nfc.ts b/src/plugins/nfc.ts
index 7635a48f5..ca24acc62 100644
--- a/src/plugins/nfc.ts
+++ b/src/plugins/nfc.ts
@@ -24,7 +24,7 @@ declare let window: any;
  * ```
  */
 @Plugin({
-  name: 'NFC',
+  pluginName: 'NFC',
   plugin: 'phonegap-nfc',
   pluginRef: 'nfc',
   repo: 'https://github.com/chariotsolutions/phonegap-nfc'
diff --git a/src/plugins/onesignal.ts b/src/plugins/onesignal.ts
index 1209d0537..40531ecd6 100644
--- a/src/plugins/onesignal.ts
+++ b/src/plugins/onesignal.ts
@@ -30,7 +30,7 @@ import { Observable } from 'rxjs/Observable';
  *
  */
 @Plugin({
-  name: 'OneSignal',
+  pluginName: 'OneSignal',
   plugin: 'onesignal-cordova-plugin',
   pluginRef: 'plugins.OneSignal',
   repo: 'https://github.com/OneSignal/OneSignal-Cordova-SDK'
diff --git a/src/plugins/pay-pal.ts b/src/plugins/pay-pal.ts
index 0539dbf70..a424bc777 100644
--- a/src/plugins/pay-pal.ts
+++ b/src/plugins/pay-pal.ts
@@ -58,7 +58,7 @@ import { Plugin, Cordova } from './plugin';
  * PayPalShippingAddress
  */
 @Plugin({
-  name: 'PayPal',
+  pluginName: 'PayPal',
   plugin: 'com.paypal.cordova.mobilesdk',
   pluginRef: 'PayPalMobile',
   repo: 'https://github.com/paypal/PayPal-Cordova-Plugin'
diff --git a/src/plugins/photo-viewer.ts b/src/plugins/photo-viewer.ts
index cca6e4039..d58cbcdb1 100644
--- a/src/plugins/photo-viewer.ts
+++ b/src/plugins/photo-viewer.ts
@@ -12,7 +12,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'PhotoViewer',
+  pluginName: 'PhotoViewer',
   plugin: 'com-sarriaroman-photoviewer',
   pluginRef: 'PhotoViewer',
   repo: 'https://github.com/sarriaroman/photoviewer'
diff --git a/src/plugins/pin-dialog.ts b/src/plugins/pin-dialog.ts
index ba7f50052..93350ae93 100644
--- a/src/plugins/pin-dialog.ts
+++ b/src/plugins/pin-dialog.ts
@@ -20,7 +20,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'PinDialog',
+  pluginName: 'PinDialog',
   plugin: 'cordova-plugin-pin-dialog',
   pluginRef: 'plugins.pinDialog',
   repo: 'https://github.com/Paldom/PinDialog'
diff --git a/src/plugins/plugin.ts b/src/plugins/plugin.ts
index f14fe2929..090afe719 100644
--- a/src/plugins/plugin.ts
+++ b/src/plugins/plugin.ts
@@ -19,7 +19,7 @@ export const getPlugin = function(pluginRef: string): any {
  * @param method
  */
 export const pluginWarn = function(pluginObj: any, method?: string) {
-  let pluginName = pluginObj.name, plugin = pluginObj.plugin;
+  let pluginName = pluginObj.pluginName, plugin = pluginObj.plugin;
   if (method) {
     console.warn('Native: tried calling ' + pluginName + '.' + method + ', but the ' + pluginName + ' plugin is not installed.');
   } else {
@@ -111,7 +111,7 @@ function callCordovaPlugin(pluginObj: any, methodName: string, args: any[], opts
   if (!pluginInstance) {
     // Do this check in here in the case that the Web API for this plugin is available (for example, Geolocation).
     if (!window.cordova) {
-      cordovaWarn(pluginObj.name, methodName);
+      cordovaWarn(pluginObj.pluginName, methodName);
       return {
         error: 'cordova_not_available'
       };
@@ -196,7 +196,7 @@ function wrapObservable(pluginObj: any, methodName: string, args: any[], opts: a
           return get(window, pluginObj.pluginRef)[opts.clearFunction].call(pluginObj, pluginResult);
         }
       } catch (e) {
-        console.warn('Unable to clear the previous observable watch for', pluginObj.name, methodName);
+        console.warn('Unable to clear the previous observable watch for', pluginObj.pluginName, methodName);
         console.error(e);
       }
     };
@@ -223,7 +223,7 @@ function wrapInstance(pluginObj: any, methodName: string, opts: any = {}) {
             }
             return pluginObj._objectInstance[opts.clearFunction].call(pluginObj, pluginResult);
           } catch (e) {
-            console.warn('Unable to clear the previous observable watch for', pluginObj.name, methodName);
+            console.warn('Unable to clear the previous observable watch for', pluginObj.pluginName, methodName);
             console.error(e);
           }
         };
@@ -268,7 +268,7 @@ function overrideFunction(pluginObj: any, methodName: string, args: any[], opts:
     if (!pluginInstance) {
       // Do this check in here in the case that the Web API for this plugin is available (for example, Geolocation).
       if (!window.cordova) {
-        cordovaWarn(pluginObj.name, methodName);
+        cordovaWarn(pluginObj.pluginName, methodName);
         observer.error({
           error: 'cordova_not_available'
         });
@@ -326,7 +326,7 @@ export const wrap = function(pluginObj: any, methodName: string, opts: any = {})
  * @usage
  * ```typescript
  * @Plugin({
- *  name: 'MyPlugin',
+ *  pluginName: 'MyPlugin',
  *  plugin: 'cordova-plugin-myplugin',
  *  pluginRef: 'window.myplugin'
  *  })
diff --git a/src/plugins/power-management.ts b/src/plugins/power-management.ts
index e5dbf7129..abb5269b2 100644
--- a/src/plugins/power-management.ts
+++ b/src/plugins/power-management.ts
@@ -16,7 +16,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'PowerManagement',
+  pluginName: 'PowerManagement',
   plugin: 'cordova-plugin-powermanagement-orig',
   pluginRef: 'powerManagement',
   repo: 'https://github.com/Viras-/cordova-plugin-powermanagement'
diff --git a/src/plugins/printer.ts b/src/plugins/printer.ts
index 72c5062a2..dc496167c 100644
--- a/src/plugins/printer.ts
+++ b/src/plugins/printer.ts
@@ -61,7 +61,7 @@ export interface PrintOptions {
  * ```
  */
 @Plugin({
-  name: 'Printer',
+  pluginName: 'Printer',
   plugin: 'de.appplant.cordova.plugin.printer',
   pluginRef: 'cordova.plugins.printer',
   repo: 'https://github.com/katzer/cordova-plugin-printer.git',
diff --git a/src/plugins/push.ts b/src/plugins/push.ts
index 10d452b31..f1b33cf7f 100644
--- a/src/plugins/push.ts
+++ b/src/plugins/push.ts
@@ -286,7 +286,7 @@ declare var PushNotification: {
  * ```
  */
 @Plugin({
-  name: 'Push',
+  pluginName: 'Push',
   plugin: 'phonegap-plugin-push',
   pluginRef: 'PushNotification',
   repo: 'https://github.com/phonegap/phonegap-plugin-push'
diff --git a/src/plugins/safari-view-controller.ts b/src/plugins/safari-view-controller.ts
index 12e009a7d..8abb169c5 100644
--- a/src/plugins/safari-view-controller.ts
+++ b/src/plugins/safari-view-controller.ts
@@ -39,7 +39,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'SafariViewController',
+  pluginName: 'SafariViewController',
   plugin: 'cordova-plugin-safariviewcontroller',
   pluginRef: 'SafariViewController',
   platforms: ['iOS', 'Android'],
diff --git a/src/plugins/screen-orientation.ts b/src/plugins/screen-orientation.ts
index a7d305f51..5a13ef437 100644
--- a/src/plugins/screen-orientation.ts
+++ b/src/plugins/screen-orientation.ts
@@ -37,7 +37,7 @@ declare var window;
  *
  */
 @Plugin({
-  name: 'ScreenOrientation',
+  pluginName: 'ScreenOrientation',
   plugin: 'cordova-plugin-screen-orientation',
   pluginRef: 'window.screen',
   repo: 'https://github.com/apache/cordova-plugin-screen-orientation',
diff --git a/src/plugins/screenshot.ts b/src/plugins/screenshot.ts
index 822876c69..1952e7f45 100644
--- a/src/plugins/screenshot.ts
+++ b/src/plugins/screenshot.ts
@@ -17,7 +17,7 @@ declare var navigator: any;
  * ```
  */
 @Plugin({
-  name: 'Screenshot',
+  pluginName: 'Screenshot',
   plugin: 'https://github.com/gitawego/cordova-screenshot.git',
   pluginRef: 'navigator.screenshot',
   repo: 'https://github.com/gitawego/cordova-screenshot.git'
diff --git a/src/plugins/securestorage.ts b/src/plugins/securestorage.ts
index 8cf873243..bdd773ce4 100644
--- a/src/plugins/securestorage.ts
+++ b/src/plugins/securestorage.ts
@@ -40,7 +40,7 @@ declare var cordova: any;
  * ```
  */
 @Plugin({
-  name: 'SecureStorage',
+  pluginName: 'SecureStorage',
   plugin: 'cordova-plugin-secure-storage',
   pluginRef: 'plugins.securestorage',
   repo: 'https://github.com/Crypho/cordova-plugin-secure-storage',
diff --git a/src/plugins/shake.ts b/src/plugins/shake.ts
index 99df465b1..e99fa2030 100644
--- a/src/plugins/shake.ts
+++ b/src/plugins/shake.ts
@@ -15,7 +15,7 @@ import { Observable } from 'rxjs/Observable';
  * ```
  */
 @Plugin({
-  name: 'Shake',
+  pluginName: 'Shake',
   plugin: 'cordova-plugin-shake',
   pluginRef: 'shake',
   repo: 'https://github.com/leecrossley/cordova-plugin-shake'
diff --git a/src/plugins/sim.ts b/src/plugins/sim.ts
index fe173d7a5..7e9118cbc 100644
--- a/src/plugins/sim.ts
+++ b/src/plugins/sim.ts
@@ -20,7 +20,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'Sim',
+  pluginName: 'Sim',
   plugin: 'cordova-plugin-sim',
   pluginRef: 'plugins.sim',
   repo: 'https://github.com/pbakondy/cordova-plugin-sim',
diff --git a/src/plugins/sms.ts b/src/plugins/sms.ts
index b674ae00f..36eab1e1e 100644
--- a/src/plugins/sms.ts
+++ b/src/plugins/sms.ts
@@ -40,7 +40,7 @@ export interface SmsOptionsAndroid {
  * ```
  */
 @Plugin({
-  name: 'SMS',
+  pluginName: 'SMS',
   plugin: 'cordova-sms-plugin',
   pluginRef: 'sms',
   repo: 'https://github.com/cordova-sms/cordova-sms-plugin',
diff --git a/src/plugins/socialsharing.ts b/src/plugins/socialsharing.ts
index c64ca8433..dedc54433 100644
--- a/src/plugins/socialsharing.ts
+++ b/src/plugins/socialsharing.ts
@@ -25,7 +25,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'SocialSharing',
+  pluginName: 'SocialSharing',
   plugin: 'cordova-plugin-x-socialsharing',
   pluginRef: 'plugins.socialsharing',
   repo: 'https://github.com/EddyVerbruggen/SocialSharing-PhoneGap-Plugin',
diff --git a/src/plugins/spinnerdialog.ts b/src/plugins/spinnerdialog.ts
index f2c9182cf..7cf33f9ac 100644
--- a/src/plugins/spinnerdialog.ts
+++ b/src/plugins/spinnerdialog.ts
@@ -15,7 +15,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'SpinnerDialog',
+  pluginName: 'SpinnerDialog',
   plugin: 'cordova-plugin-spinner-dialog',
   pluginRef: 'window.plugins.spinnerDialog',
   repo: 'https://github.com/Paldom/SpinnerDialog',
diff --git a/src/plugins/splashscreen.ts b/src/plugins/splashscreen.ts
index 974c03abe..ad55524f8 100644
--- a/src/plugins/splashscreen.ts
+++ b/src/plugins/splashscreen.ts
@@ -15,7 +15,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'Splashscreen',
+  pluginName: 'Splashscreen',
   plugin: 'cordova-plugin-splashscreen',
   pluginRef: 'navigator.splashscreen',
   repo: 'https://github.com/apache/cordova-plugin-splashscreen'
diff --git a/src/plugins/sqlite.ts b/src/plugins/sqlite.ts
index ee9e25cae..70eb8851e 100644
--- a/src/plugins/sqlite.ts
+++ b/src/plugins/sqlite.ts
@@ -31,7 +31,7 @@ declare var sqlitePlugin;
  *
  */
 @Plugin({
-  name: 'SQLite',
+  pluginName: 'SQLite',
   pluginRef: 'sqlitePlugin',
   plugin: 'cordova-sqlite-storage',
   repo: 'https://github.com/litehelpers/Cordova-sqlite-storage'
@@ -83,7 +83,7 @@ export class SQLite {
         });
       } else {
         pluginWarn({
-          name: 'SQLite',
+          pluginName: 'SQLite',
           plugin: 'cordova-sqlite-storage'
         });
       }
diff --git a/src/plugins/statusbar.ts b/src/plugins/statusbar.ts
index 2bf89ed5d..16f81be1d 100644
--- a/src/plugins/statusbar.ts
+++ b/src/plugins/statusbar.ts
@@ -22,7 +22,7 @@ declare var window;
  *
  */
 @Plugin({
-  name: 'StatusBar',
+  pluginName: 'StatusBar',
   plugin: 'cordova-plugin-statusbar',
   pluginRef: 'StatusBar',
   repo: 'https://github.com/apache/cordova-plugin-statusbar',
diff --git a/src/plugins/stepcounter.ts b/src/plugins/stepcounter.ts
index d10e1f9a6..2959939ef 100644
--- a/src/plugins/stepcounter.ts
+++ b/src/plugins/stepcounter.ts
@@ -20,7 +20,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'Stepcounter',
+  pluginName: 'Stepcounter',
   plugin: 'https://github.com/texh/cordova-plugin-stepcounter',
   pluginRef: 'stepcounter',
   repo: 'https://github.com/texh/cordova-plugin-stepcounter',
diff --git a/src/plugins/streaming-media.ts b/src/plugins/streaming-media.ts
index 96534232c..365b085bf 100644
--- a/src/plugins/streaming-media.ts
+++ b/src/plugins/streaming-media.ts
@@ -19,7 +19,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'StreamingMedia',
+  pluginName: 'StreamingMedia',
   plugin: 'cordova-plugin-streaming-media',
   pluginRef: 'plugins.streamingMedia',
   repo: 'https://github.com/nchutchind/cordova-plugin-streaming-media',
diff --git a/src/plugins/text-to-speech.ts b/src/plugins/text-to-speech.ts
index f6afd107e..56c762849 100644
--- a/src/plugins/text-to-speech.ts
+++ b/src/plugins/text-to-speech.ts
@@ -25,7 +25,7 @@ export interface TTSOptions {
  * ```
  */
 @Plugin({
-  name: 'TextToSpeech',
+  pluginName: 'TextToSpeech',
   plugin: 'cordova-plugin-tts',
   pluginRef: 'TTS',
   repo: 'https://github.com/vilic/cordova-plugin-tts'
diff --git a/src/plugins/themeable-browser.ts b/src/plugins/themeable-browser.ts
index 8ce65868e..721aa82d5 100644
--- a/src/plugins/themeable-browser.ts
+++ b/src/plugins/themeable-browser.ts
@@ -144,7 +144,7 @@ export interface ThemeableBrowserOptions {
  * We suggest that you refer to the plugin's repository for additional information on usage that may not be covered here.
  */
 @Plugin({
-  name: 'ThemeableBrowser',
+  pluginName: 'ThemeableBrowser',
   plugin: 'cordova-plugin-themeablebrowser',
   pluginRef: 'cordova.ThemeableBrowser',
   repo: 'https://github.com/initialxy/cordova-plugin-themeablebrowser'
diff --git a/src/plugins/toast.ts b/src/plugins/toast.ts
index 3e1613479..8f5e5b555 100644
--- a/src/plugins/toast.ts
+++ b/src/plugins/toast.ts
@@ -57,7 +57,7 @@ export interface ToastOptions {
  * ToastOptions
  */
 @Plugin({
-  name: 'Toast',
+  pluginName: 'Toast',
   plugin: 'cordova-plugin-x-toast',
   pluginRef: 'plugins.toast',
   repo: 'https://github.com/EddyVerbruggen/Toast-PhoneGap-Plugin',
diff --git a/src/plugins/touchid.ts b/src/plugins/touchid.ts
index 749d7b21e..a5ac8d609 100644
--- a/src/plugins/touchid.ts
+++ b/src/plugins/touchid.ts
@@ -45,7 +45,7 @@ import { Cordova, Plugin } from './plugin';
  *  -  `-8` - TouchID is locked out from too many tries
  */
 @Plugin({
-  name: 'TouchID',
+  pluginName: 'TouchID',
   plugin: 'cordova-plugin-touch-id',
   pluginRef: 'plugins.touchid',
   repo: 'https://github.com/EddyVerbruggen/cordova-plugin-touch-id',
diff --git a/src/plugins/twitter-connect.ts b/src/plugins/twitter-connect.ts
index cd3a7730c..1ccd62097 100644
--- a/src/plugins/twitter-connect.ts
+++ b/src/plugins/twitter-connect.ts
@@ -27,7 +27,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'TwitterConnect',
+  pluginName: 'TwitterConnect',
   plugin: 'twitter-connect-plugin',
   pluginRef: 'TwitterConnect',
   repo: 'https://github.com/ManifestWebDesign/twitter-connect-plugin',
diff --git a/src/plugins/vibration.ts b/src/plugins/vibration.ts
index df09bcaeb..0833cd045 100644
--- a/src/plugins/vibration.ts
+++ b/src/plugins/vibration.ts
@@ -25,7 +25,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'Vibration',
+  pluginName: 'Vibration',
   plugin: 'cordova-plugin-vibration',
   pluginRef: 'navigator',
   repo: 'https://github.com/apache/cordova-plugin-vibration',
diff --git a/src/plugins/video-editor.ts b/src/plugins/video-editor.ts
index 0c9399a45..9c418c869 100644
--- a/src/plugins/video-editor.ts
+++ b/src/plugins/video-editor.ts
@@ -137,7 +137,7 @@ export interface VideoInfo {
  * ```
  */
 @Plugin({
-  name: 'VideoEditor',
+  pluginName: 'VideoEditor',
   plugin: 'cordova-plugin-video-editor',
   pluginRef: 'VideoEditor',
   repo: 'https://github.com/jbavari/cordova-plugin-video-editor',
diff --git a/src/plugins/video-player.ts b/src/plugins/video-player.ts
index 47089b03b..053ad8507 100644
--- a/src/plugins/video-player.ts
+++ b/src/plugins/video-player.ts
@@ -38,7 +38,7 @@ export interface VideoOptions {
  * ```
  */
 @Plugin({
-  name: 'VideoPlayer',
+  pluginName: 'VideoPlayer',
   plugin: 'cordova-plugin-videoplayer',
   pluginRef: 'VideoPlayer',
   repo: 'https://github.com/moust/cordova-plugin-videoplayer',
diff --git a/src/plugins/webintent.ts b/src/plugins/webintent.ts
index 8373dbe0a..098aee294 100644
--- a/src/plugins/webintent.ts
+++ b/src/plugins/webintent.ts
@@ -17,7 +17,7 @@ declare var window;
  * ```
  */
 @Plugin({
-  name: 'WebIntent',
+  pluginName: 'WebIntent',
   plugin: 'https://github.com/Initsogar/cordova-webintent.git',
   pluginRef: 'window.plugins.webintent',
   repo: 'https://github.com/Initsogar/cordova-webintent.git',
diff --git a/src/plugins/youtube-video-player.ts b/src/plugins/youtube-video-player.ts
index 1c6e0e494..9e9fc2217 100644
--- a/src/plugins/youtube-video-player.ts
+++ b/src/plugins/youtube-video-player.ts
@@ -13,7 +13,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'YoutubeVideoPlayer',
+  pluginName: 'YoutubeVideoPlayer',
   plugin: 'https://github.com/Glitchbone/CordovaYoutubeVideoPlayer.git',
   pluginRef: 'YoutubeVideoPlayer',
   repo: 'https://github.com/Glitchbone/CordovaYoutubeVideoPlayer',
diff --git a/src/plugins/z-bar.ts b/src/plugins/z-bar.ts
index b33ba0854..1194bdd1c 100644
--- a/src/plugins/z-bar.ts
+++ b/src/plugins/z-bar.ts
@@ -39,7 +39,7 @@ import { Plugin, Cordova } from './plugin';
  *
  */
 @Plugin({
-  name: 'ZBar',
+  pluginName: 'ZBar',
   plugin: 'cordova-plugin-cszbar',
   pluginRef: 'cloudSky.zBar',
   repo: 'https://github.com/tjwoon/csZBar',
diff --git a/src/plugins/zip.ts b/src/plugins/zip.ts
index 01dd6e972..7a2e431d5 100644
--- a/src/plugins/zip.ts
+++ b/src/plugins/zip.ts
@@ -18,7 +18,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
-  name: 'Zip',
+  pluginName: 'Zip',
   plugin: 'cordova-plugin-zip',
   pluginRef: 'zip',
   repo: 'https://github.com/MobileChromeApps/cordova-plugin-zip',