diff --git a/README.md b/README.md
index 734d12d..8853703 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Touch UI which lets you create a generic multifield in a dialog.
 |------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | CI master  | [![release and deploy](https://github.com/merkle-open/aem-generic-multifield/actions/workflows/release-and-deploy-release.yml/badge.svg?branch=6.5%2Fmaster)](https://github.com/merkle-open/aem-generic-multifield/actions/workflows/release-and-deploy-release.yml) |
 | CI develop | [![deploy snapshot](https://github.com/merkle-open/aem-generic-multifield/actions/workflows/deploy-snapshot.yml/badge.svg?branch=6.5%2Fdevelop)](https://github.com/merkle-open/aem-generic-multifield/actions/workflows/deploy-snapshot.yml)                         |
-| Dependency | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.namics.oss.aem/genericmultifield/badge.svg?version=3.2.0)](https://search.maven.org/artifact/com.namics.oss.aem/genericmultifield/3.2.0/bundle)                                                |
+| Dependency | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.namics.oss.aem/genericmultifield/badge.svg?version=3.2.1)](https://search.maven.org/artifact/com.namics.oss.aem/genericmultifield/3.2.1/bundle)                                                |
 
 <!-- TOC -->
 * [Generic Multifield for AEM 6.5](#generic-multifield-for-aem-65)
@@ -34,7 +34,7 @@ Touch UI which lets you create a generic multifield in a dialog.
     <dependency>
       <groupId>com.namics.oss.aem</groupId>
       <artifactId>genericmultifield</artifactId>
-      <version>3.2.0</version>
+      <version>3.2.1</version>
     </dependency>
 ```
 
@@ -77,7 +77,7 @@ Example usage of the Generic Multifield in your component `_cq_dialog.xml` defin
         name="./title"/>
         <genericmultifield
         jcr:primaryType="nt:unstructured"
-        sling:resourceType="merkle/genericmultifield"
+        sling:resourceType="namics/genericmultifield"
         itemDialog="/your/project/path/component/item-dialog.xml"
         fieldLabel="Generic Multifield"
         fieldDescription="A list of generic multfield items"
diff --git a/pom.xml b/pom.xml
index 356c714..2d08ea8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>com.namics.oss.aem</groupId>
     <artifactId>genericmultifield</artifactId>
     <packaging>bundle</packaging>
-    <version>3.2.0</version>
+    <version>3.2.1-SNAPSHOT</version>
     <name>Generic Multi-field for AEM 6.5</name>
     <description>com.namics.oss.aem - Generic Multi-field for AEM 6.5</description>
     <url>https://github.com/merkle-open/aem-generic-multifield</url>
@@ -37,9 +37,6 @@
 
         <maven.build.timestamp.format>yyyy-MM-dd-z-HH-mm-ss</maven.build.timestamp.format>
         <git.build.time>${maven.build.timestamp}</git.build.time>
-        <git.branch>unknown</git.branch>
-        <git.commit.id>unknown</git.commit.id>
-        <git.commit.time>unknown</git.commit.time>
         <java.version>11</java.version>
         <encoding>UTF-8</encoding>
         <project.build.sourceEncoding>${encoding}</project.build.sourceEncoding>
@@ -64,8 +61,8 @@
     <dependencies>
         <dependency>
             <groupId>com.adobe.aem</groupId>
-            <artifactId>aem-sdk-api</artifactId>
-            <version>2023.12.14697.20231215T125030Z-231200</version>
+            <artifactId>uber-jar</artifactId>
+            <version>6.5.18</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield.json b/src/main/resources/SLING-INF/apps/namics/genericmultifield.json
similarity index 100%
rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield.json
rename to src/main/resources/SLING-INF/apps/namics/genericmultifield.json
diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/css.json b/src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/css.json
similarity index 100%
rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/css.json
rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/css.json
diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/css/css.txt b/src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/css/css.txt
similarity index 100%
rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/css/css.txt
rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/css/css.txt
diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/css/genericmultifield.css b/src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/css/genericmultifield.css
similarity index 100%
rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/css/genericmultifield.css
rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/css/genericmultifield.css
diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js.json b/src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js.json
similarity index 100%
rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js.json
rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js.json
diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js/CUI.GenericMultiField.js b/src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js/CUI.GenericMultiField.js
similarity index 100%
rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js/CUI.GenericMultiField.js
rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js/CUI.GenericMultiField.js
diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js/GenericMultifieldDialogHandler.js b/src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js/GenericMultifieldDialogHandler.js
similarity index 100%
rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js/GenericMultifieldDialogHandler.js
rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js/GenericMultifieldDialogHandler.js
diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js/GenericMultifieldHelper.js b/src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js/GenericMultifieldHelper.js
similarity index 100%
rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js/GenericMultifieldHelper.js
rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js/GenericMultifieldHelper.js
diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js/Namespace.js b/src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js/Namespace.js
similarity index 100%
rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js/Namespace.js
rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js/Namespace.js
diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js/js.txt b/src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js/js.txt
similarity index 100%
rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js/js.txt
rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js/js.txt
diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js/validations.js b/src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js/validations.js
similarity index 100%
rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/clientlibs/js/validations.js
rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/clientlibs/js/validations.js
diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/init.jsp b/src/main/resources/SLING-INF/apps/namics/genericmultifield/init.jsp
similarity index 100%
rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/init.jsp
rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/init.jsp
diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/readonly/readonly.jsp b/src/main/resources/SLING-INF/apps/namics/genericmultifield/readonly/readonly.jsp
similarity index 100%
rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/readonly/readonly.jsp
rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/readonly/readonly.jsp
diff --git a/src/main/resources/SLING-INF/apps/merkle/genericmultifield/render.jsp b/src/main/resources/SLING-INF/apps/namics/genericmultifield/render.jsp
similarity index 100%
rename from src/main/resources/SLING-INF/apps/merkle/genericmultifield/render.jsp
rename to src/main/resources/SLING-INF/apps/namics/genericmultifield/render.jsp