diff --git a/demo/app/main-view-model.ts b/demo/app/main-view-model.ts
index f519aa3..4553ee0 100644
--- a/demo/app/main-view-model.ts
+++ b/demo/app/main-view-model.ts
@@ -1,5 +1,5 @@
 import {Observable} from 'data/observable';
-import {AudioPlayer, Playlist, MediaTrack, PlaybackEventListener, PlaybackEvent} from '@nota/nativescript-audioplayer';
+import {AudioPlayer, Playlist, MediaTrack, PlaybackEventListener, PlaybackEvent} from 'nativescript-audioplayer';
 
 export class HelloWorldModel extends Observable implements PlaybackEventListener {
   public message: string;
diff --git a/demo/package.json b/demo/package.json
index caf0deb..6410a8a 100644
--- a/demo/package.json
+++ b/demo/package.json
@@ -11,7 +11,7 @@
 		}
 	},
 	"dependencies": {
-		"@nota/nativescript-audioplayer": "file:..",
+		"nativescript-audioplayer": "file:..",
 		"tns-core-modules": "~2.0.1"
 	},
 	"devDependencies": {
diff --git a/package.json b/package.json
index bc50276..e61cda4 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "@nota/nativescript-audioplayer",
+	"name": "nativescript-audioplayer",
 	"version": "0.0.8",
 	"description": "Fully featured AudioPlayer for NativeScript. Gapless playlist playback with playbackrate and platform-specific notification and remote controls during playback",
 	"nativescript": {
@@ -15,7 +15,7 @@
 		"demo.ios": "npm run prepdemo && cd demo && tns emulate ios",
 		"demo.android": "npm run prepdemo && cd demo && tns run android",
 		"prepdemo": "npm run build && npm run reload",
-		"reload": "cd demo && tns plugin remove @nota/nativescript-audioplayer && tns plugin add .. && tns install",
+		"reload": "cd demo && tns plugin remove nativescript-audioplayer && tns plugin add .. && tns install",
 		"apk": "cd demo && tns build android --copy-to .",
 		"gen.typings.ios": "cd demo && TNS_TYPESCRIPT_DECLARATIONS_PATH=\"$(pwd)/../gen-typings\" tns build ios && cd .. && cp gen-typings-i386/objc!LYTAudioPlayer.d.ts src/LYTAudioPlayer.gen.d.ts"
 	},
diff --git a/platforms/android/include.gradle b/platforms/android/include.gradle
index bc96a07..51d7bc4 100644
--- a/platforms/android/include.gradle
+++ b/platforms/android/include.gradle
@@ -1,3 +1,12 @@
+android {
+    productFlavors {
+        'nativescript-audioplayer' {
+            dimension 'nativescript-audioplayer' {
+                
+            }
+        }
+    }
+}
 dependencies {
     compile 'dk.nota.lyt:libvlc-service:0.2.3'
     // compile 'com.android.support:appcompat-v7:23+'