diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index b6bec7a..c39c351 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -45,7 +45,7 @@ jobs:
       uses: shogo82148/actions-upload-release-asset@v1.7.5
       with:
         upload_url: ${{ steps.get_release_upload_url.outputs.upload_url }}
-        asset_path: ./target/openrefine-commons.zip
-        asset_name: openrefine-commons-${{ env.VERSION_STRING }}.zip
+        asset_path: ./target/openrefine-commons-extension-${{ env.VERSION_STRING }}.zip
+        asset_name: openrefine-commons-extension-${{ env.VERSION_STRING }}.zip
         asset_content_type: application/zip
   
diff --git a/pom.xml b/pom.xml
index 42cd8ba..3d52a35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,6 +93,7 @@
         <artifactId>maven-assembly-plugin</artifactId>
         <version>3.7.1</version>
         <configuration>
+          <finalName>openrefine-commons-extension-${project.version}</finalName>
           <appendAssemblyId>false</appendAssemblyId>	
           <descriptors>
             <descriptor>src/assembly/extension.xml</descriptor>
diff --git a/src/assembly/extension.xml b/src/assembly/extension.xml
index fd1892a..c8f7fe1 100644
--- a/src/assembly/extension.xml
+++ b/src/assembly/extension.xml
@@ -2,21 +2,22 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
     <id>openrefine-commons-${openrefine.version}</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
+    <includeBaseDirectory>true</includeBaseDirectory>
+    <baseDirectory>commons-extension</baseDirectory>
     <formats>
         <format>zip</format>
     </formats>
     <fileSets>
         <fileSet>
             <directory>module/</directory>
-            <outputDirectory>module/</outputDirectory>
+            <outputDirectory></outputDirectory>
             <excludes>
                 <exclude>**/*.java</exclude>
             </excludes>
         </fileSet>
         <fileSet>
             <directory>src/main/resources/module</directory>
-            <outputDirectory>module</outputDirectory>
+            <outputDirectory></outputDirectory>
         </fileSet>
     </fileSets>
 </assembly>