diff --git a/uber/pom.xml b/fin/pom.xml
similarity index 87%
rename from uber/pom.xml
rename to fin/pom.xml
index d05a8090c7..11b63d2e2c 100644
--- a/uber/pom.xml
+++ b/fin/pom.xml
@@ -9,7 +9,7 @@
         <artifactId>project</artifactId>
         <version>24.4.0-SNAPSHOT</version>
     </parent>
-    <artifactId>piranha-uber</artifactId>
+    <artifactId>piranha-fin</artifactId>
     <packaging>jar</packaging>
-    <name>Piranha - Uber</name>
+    <name>Piranha - Fin</name>
 </project>
diff --git a/uber/src/main/java/cloud/piranha/uber/UberPiranha.java b/fin/src/main/java/cloud/piranha/fin/FinPiranha.java
similarity index 90%
rename from uber/src/main/java/cloud/piranha/uber/UberPiranha.java
rename to fin/src/main/java/cloud/piranha/fin/FinPiranha.java
index b5558b96fe..47355fef65 100644
--- a/uber/src/main/java/cloud/piranha/uber/UberPiranha.java
+++ b/fin/src/main/java/cloud/piranha/fin/FinPiranha.java
@@ -26,21 +26,21 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package cloud.piranha.uber;
+package cloud.piranha.fin;
 
 import java.io.File;
 
 /**
- * The Uber version of Piranha.
+ * The Fin version of Piranha.
  *
  * @author Manfred Riem (mriem@manorrock.com)
  */
-public class UberPiranha implements Runnable {
+public class FinPiranha implements Runnable {
     
     /**
      * Stores the temporary directory.
      */
-    private File tempDirectory = new File(".piranhaUber");
+    private File tempDirectory = new File(".piranha/fin");
 
     /**
      * Main method.
@@ -48,7 +48,7 @@ public class UberPiranha implements Runnable {
      * @param arguments the command-line arguments.
      */
     public static void main(String[] arguments) {
-        UberPiranha piranha = new UberPiranha();
+        FinPiranha piranha = new FinPiranha();
         piranha.parseArguments(arguments);
         piranha.run();
     }
@@ -60,7 +60,7 @@ public static void main(String[] arguments) {
      */
     private void parseArguments(String[] arguments) {
         for(int i=0; i<arguments.length; i++) {
-            if (arguments[i].equals("--uber-temp-directory")) {
+            if (arguments[i].equals("--fin-temp-directory")) {
                 tempDirectory = new File(arguments[i + 1]);
             }
         }
diff --git a/uber/src/main/java/module-info.java b/fin/src/main/java/module-info.java
similarity index 92%
rename from uber/src/main/java/module-info.java
rename to fin/src/main/java/module-info.java
index 19f2f996a5..7221f76e92 100644
--- a/uber/src/main/java/module-info.java
+++ b/fin/src/main/java/module-info.java
@@ -27,12 +27,12 @@
  */
 
 /**
- * This module delivers Piranha Uber.
+ * This module delivers Piranha Fin.
  * 
  * @author Manfred Riem (mriem@manorrock.com)
  */
-module cloud.piranha.embedded {
+module cloud.piranha.fin {
 
-    exports cloud.piranha.uber;
-    opens cloud.piranha.uber;
+    exports cloud.piranha.fin;
+    opens cloud.piranha.fin;
 }
diff --git a/pom.xml b/pom.xml
index beb18d5132..364f462207 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
         <module>micro</module>
         <module>resource</module>
         <module>spring</module>
-        <module>uber</module>
+        <module>fin</module>
     </modules>
 
     <scm>