diff --git a/.yo-rc.json b/.yo-rc.json
index 820cff0..0c945ab 100644
--- a/.yo-rc.json
+++ b/.yo-rc.json
@@ -1,12 +1,11 @@
 {
   "@microsoft/generator-sharepoint": {
     "version": "1.4.1",
-    "libraryName": "accordion",
+    "libraryName": "accordion-web-part",
     "libraryId": "27a6fd90-42a1-4e39-8862-08ed0e7803bc",
     "environment": "onprem",
     "packageManager": "npm",
-    "solutionName": "accordion",
+    "solutionName": "accordion-web-part",
     "componentType": "webpart"
   }
 }
-
diff --git a/README.md b/README.md
index 89665eb..a7d3fac 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ npm install
 npm run package
 ```
 
-Das Paket wird unter `sharepoint/solution/accordion.sppkg` erzeugt. Es kann im App Catalog zentral bereitgestellt
+Das Paket wird unter `sharepoint/solution/accordion-web-part.sppkg` erzeugt. Es kann im App Catalog zentral bereitgestellt
 werden. Danach steht das WebPart unter dem Namen **Accordion** beziehungsweise **Akkordeon** im WebPart-Picker zur Verfügung.
 
 ## Sicherheit
diff --git a/config/package-solution.json b/config/package-solution.json
index 0b145ba..35711e1 100644
--- a/config/package-solution.json
+++ b/config/package-solution.json
@@ -1,15 +1,14 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/spfx-build/package-solution.schema.json",
   "solution": {
-    "name": "accordion-client-side-solution",
-    "title": "Accordion",
+    "name": "accordion-web-part",
+    "title": "accordion-web-part",
     "id": "27a6fd90-42a1-4e39-8862-08ed0e7803bc",
     "version": "1.0.0.0",
     "includeClientSideAssets": true,
     "skipFeatureDeployment": true
   },
   "paths": {
-    "zippedPackage": "solution/accordion.sppkg"
+    "zippedPackage": "solution/accordion-web-part.sppkg"
   }
 }
-
diff --git a/tests/validate-project.js b/tests/validate-project.js
index 9e44cbc..66fe946 100644
--- a/tests/validate-project.js
+++ b/tests/validate-project.js
@@ -22,6 +22,10 @@ assert(packageJson.version === '1.0.0', 'Package version must be 1.0.0.');
 assert(solution.version === '1.0.0.0', 'Solution version must be 1.0.0.0.');
 assert(solution.includeClientSideAssets === true, 'Client-side assets must be included.');
 assert(solution.skipFeatureDeployment === true, 'Solution must support central deployment.');
+assert(packageJson.name === 'accordion-web-part' && solution.name === 'accordion-web-part' &&
+  solution.title === 'accordion-web-part', 'Accordion package naming is inconsistent.');
+assert(json('config/package-solution.json').paths.zippedPackage === 'solution/accordion-web-part.sppkg',
+  'Accordion package file name is inconsistent.');
 assert(manifest.componentType === 'WebPart', 'Component must be a web part.');
 assert(!!config.bundles['accordion-web-part'], 'Accordion bundle is missing.');
 assert(webPart.indexOf("PropertyPaneDropdown('listId'") >= 0, 'Dynamic list selection is missing.');