diff --git a/.yo-rc.json b/.yo-rc.json
index 6eb9fc7..635dfbb 100644
--- a/.yo-rc.json
+++ b/.yo-rc.json
@@ -1,12 +1,11 @@
 {
   "@microsoft/generator-sharepoint": {
     "version": "1.4.1",
-    "libraryName": "dynamic-poll",
+    "libraryName": "dynamic-poll-web-part",
     "libraryId": "900239c9-b6c7-495d-a386-2d08a81a66f3",
     "environment": "onprem",
     "packageManager": "npm",
-    "solutionName": "dynamic-poll",
+    "solutionName": "dynamic-poll-web-part",
     "componentType": "webpart"
   }
 }
-
diff --git a/README.md b/README.md
index ef22ea7..0e1ff39 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ npm install
 npm run package
 ```
 
-Das fertige Paket liegt unter `sharepoint/solution/dynamic-poll.sppkg`.
+Das fertige Paket liegt unter `sharepoint/solution/dynamic-poll-web-part.sppkg`.
 
 ## Hinweise
 
diff --git a/config/package-solution.json b/config/package-solution.json
index c4988c1..bfa584a 100644
--- a/config/package-solution.json
+++ b/config/package-solution.json
@@ -1,12 +1,12 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/spfx-build/package-solution.schema.json",
   "solution": {
-    "name": "dynamic-poll-client-side-solution",
+    "name": "dynamic-poll-web-part",
+    "title": "dynamic-poll-web-part",
     "id": "900239c9-b6c7-495d-a386-2d08a81a66f3",
     "version": "1.0.0.0",
     "includeClientSideAssets": true,
     "skipFeatureDeployment": true
   },
-  "paths": { "zippedPackage": "solution/dynamic-poll.sppkg" }
+  "paths": { "zippedPackage": "solution/dynamic-poll-web-part.sppkg" }
 }
-
diff --git a/tests/validate-project.js b/tests/validate-project.js
index 2a2017d..c31d640 100644
--- a/tests/validate-project.js
+++ b/tests/validate-project.js
@@ -17,6 +17,10 @@ var styles = read('src/webparts/dynamicPoll/components/DynamicPoll.module.scss')
 
 assert(packageJson.version === '1.0.0' && solution.version === '1.0.0.0', 'Version mismatch.');
 assert(solution.includeClientSideAssets === true && solution.skipFeatureDeployment === true, 'Central deployment missing.');
+assert(packageJson.name === 'dynamic-poll-web-part' && solution.name === 'dynamic-poll-web-part' &&
+  solution.title === 'dynamic-poll-web-part', 'Dynamic Poll package naming is inconsistent.');
+assert(json('config/package-solution.json').paths.zippedPackage === 'solution/dynamic-poll-web-part.sppkg',
+  'Dynamic Poll package file name is inconsistent.');
 assert(manifest.componentType === 'WebPart', 'Component is not a web part.');
 assert(webPart.indexOf("PropertyPaneDropdown('pollListId'") >= 0 && webPart.indexOf("PropertyPaneDropdown('answerListId'") >= 0,
   'List selection is missing.');