diff --git a/demo/plugins/pom.xml b/demo/plugins/pom.xml
index dc7a8fc..4460964 100644
--- a/demo/plugins/pom.xml
+++ b/demo/plugins/pom.xml
@@ -44,7 +44,7 @@
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
                     </descriptorRefs>
-                    <finalName>${project.artifactId}-${project.version}-plugin</finalName>
+                    <finalName>${project.artifactId}-${project.version}-all</finalName>
                     <appendAssemblyId>false</appendAssemblyId>
                     <attach>false</attach>
                     <archive>
diff --git a/run-demo.bat b/run-demo.bat
index 1ef086b..6622d90 100644
--- a/run-demo.bat
+++ b/run-demo.bat
@@ -12,17 +12,19 @@ mkdir demo-dist\plugins
 
 REM copy artifacts to demo-dist folder
 xcopy demo\app\target\pf4j-demo-app-*.zip demo-dist /s /i
-xcopy demo\plugins\plugin1\target\*plugin.jar demo-dist\plugins /s
-xcopy demo\plugins\plugin2\target\*plugin.jar demo-dist\plugins /s
+xcopy demo\plugins\plugin1\target\pf4j-demo-plugin1-*-all.jar demo-dist\plugins /s
+xcopy demo\plugins\plugin2\target\pf4j-demo-plugin2-*-all.jar demo-dist\plugins /s
 xcopy demo\plugins\enabled.txt demo-dist\plugins /s
 xcopy demo\plugins\disabled.txt demo-dist\plugins /s
 
 cd demo-dist
 
 REM unzip app
-unzip pf4j-demo-app-*.zip
-rm pf4j-demo-app-*.zip
+jar xf pf4j-demo-app-*.zip
+del pf4j-demo-app-*.zip
 
 REM run demo
-java -jar pf4j-demo-app-*-SNAPSHOT.jar
+rename pf4j-demo-app-*-SNAPSHOT.jar pf4j-demo.jar
+java -jar pf4j-demo.jar
+
 cd ..
diff --git a/run-demo.sh b/run-demo.sh
index 01e6073..96ba799 100755
--- a/run-demo.sh
+++ b/run-demo.sh
@@ -12,12 +12,20 @@ rm -fr demo-dist
 mkdir -p demo-dist/plugins
 
 # copy artifacts to demo-dist folder
-cp -r demo/app/target/pf4j-demo-*/* demo-dist/
-cp demo/plugins/*/target/*plugin.jar demo-dist/plugins/
+cp demo/app/target/pf4j-demo-*.zip demo-dist/
+cp demo/plugins/plugin1/target/pf4j-demo-plugin1-*-all.jar demo-dist/plugins/
+cp demo/plugins/plugin2/target/pf4j-demo-plugin2-*-all.jar demo-dist/plugins/
 cp demo/plugins/enabled.txt demo-dist/plugins/
 cp demo/plugins/disabled.txt demo-dist/plugins/
 
-# run demo
 cd demo-dist
-java -jar pf4j-demo-app-*-SNAPSHOT.jar
+
+# unzip app
+jar xf pf4j-demo-app-*.zip
+rm pf4j-demo-app-*.zip
+
+# run demo
+mv pf4j-demo-app-*-SNAPSHOT.jar pf4j-demo.jar
+java -jar pf4j-demo.jar
+
 cd -