diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ad79176..f12db10 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,5 +1,5 @@
 
-name: Release
+name: Prepare Release Draft
 
 on:
   workflow_dispatch:
@@ -33,7 +33,7 @@ jobs:
         with:
           name: 'aem-msm-tools-${{ inputs.releaseVersion }}'
           path: ./artifacts
-      - name: Create Github Release
+      - name: Create Github Release Draft
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: gh release create ${{ inputs.releaseVersion }} --draft --generate-notes --title ${{ inputs.releaseVersion }} ./artifacts/*.zip
diff --git a/all/pom.xml b/all/pom.xml
index fdae700..aed4e03 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -31,7 +31,7 @@
     <!-- ====================================================================== -->
     <!-- P R O J E C T  D E S C R I P T I O N                                   -->
     <!-- ====================================================================== -->
-    <artifactId>msm-tool.all</artifactId>
+    <artifactId>msm-tools.all</artifactId>
     <packaging>content-package</packaging>
     <name>MSM Tools - All</name>
     <description>All content package for MSM Tools</description>
@@ -56,13 +56,13 @@
                     <embeddeds>
                         <embedded>
                             <groupId>com.valtech.aem</groupId>
-                            <artifactId>msm-tool.ui.apps</artifactId>
+                            <artifactId>msm-tools.ui.apps</artifactId>
                             <type>zip</type>
                             <target>/apps/valtech-msm-tools-packages/application/install</target>
                         </embedded>
                         <embedded>
                             <groupId>com.valtech.aem</groupId>
-                            <artifactId>msm-tool.core</artifactId>
+                            <artifactId>msm-tools.core</artifactId>
                             <target>/apps/valtech-msm-tools-packages/application/install</target>
                         </embedded>
                     </embeddeds>
@@ -168,13 +168,13 @@
     <dependencies>
         <dependency>
             <groupId>com.valtech.aem</groupId>
-            <artifactId>msm-tool.ui.apps</artifactId>
+            <artifactId>msm-tools.ui.apps</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
         </dependency>
         <dependency>
             <groupId>com.valtech.aem</groupId>
-            <artifactId>msm-tool.core</artifactId>
+            <artifactId>msm-tools.core</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/core/pom.xml b/core/pom.xml
index ce4e744..30db0d3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -23,7 +23,7 @@
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>msm-tool.core</artifactId>
+    <artifactId>msm-tools.core</artifactId>
     <name>MSM Tools - Core</name>
     <description>Core bundle for MSM Tools</description>
     <build>
diff --git a/ui.apps.structure/pom.xml b/ui.apps.structure/pom.xml
index c917ff3..dd54423 100644
--- a/ui.apps.structure/pom.xml
+++ b/ui.apps.structure/pom.xml
@@ -15,7 +15,7 @@
     <!-- ====================================================================== -->
     <!-- P R O J E C T  D E S C R I P T I O N                                   -->
     <!-- ====================================================================== -->
-    <artifactId>msm-tool.ui.apps.structure</artifactId>
+    <artifactId>msm-tools.ui.apps.structure</artifactId>
     <packaging>content-package</packaging>
     <name>MSM Tools - Repository Structure Package</name>
     <description>
diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
index 116af84..0cd9056 100644
--- a/ui.apps/pom.xml
+++ b/ui.apps/pom.xml
@@ -30,7 +30,7 @@
     <!-- ====================================================================== -->
     <!-- P R O J E C T  D E S C R I P T I O N                                   -->
     <!-- ====================================================================== -->
-    <artifactId>msm-tool.ui.apps</artifactId>
+    <artifactId>msm-tools.ui.apps</artifactId>
     <packaging>content-package</packaging>
     <name>MSM Tool - UI apps</name>
     <description>UI apps package for MSM Tools</description>
@@ -52,12 +52,12 @@
                         <cloudManagerTarget>none</cloudManagerTarget>
                     </properties>
                     <group>com.valtech.aem</group>
-                    <name>msm-tool.ui.apps</name>
+                    <name>msm-tools.ui.apps</name>
                     <packageType>application</packageType>
                                         <repositoryStructurePackages>
                         <repositoryStructurePackage>
                             <groupId>com.valtech.aem</groupId>
-                            <artifactId>msm-tool.ui.apps.structure</artifactId>
+                            <artifactId>msm-tools.ui.apps.structure</artifactId>
                         </repositoryStructurePackage>
                     </repositoryStructurePackages>
                     <dependencies>
@@ -108,7 +108,7 @@
     <dependencies>
         <dependency>
             <groupId>com.valtech.aem</groupId>
-            <artifactId>msm-tool.core</artifactId>
+            <artifactId>msm-tools.core</artifactId>
             <version>${project.version}</version>
         </dependency>
 
@@ -116,7 +116,7 @@
 
         <dependency>
             <groupId>com.valtech.aem</groupId>
-            <artifactId>msm-tool.ui.apps.structure</artifactId>
+            <artifactId>msm-tools.ui.apps.structure</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
         </dependency>