diff --git a/core b/core
index 3b8ac2d..4f780fe 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 3b8ac2d6e806320a9c64ff452223642862b0fe43
+Subproject commit 4f780fee57ac4d171fd3db8e20bdcda7a4d27d0b
diff --git a/src/main/java/rife/bld/blueprints/AppProjectBlueprint.java b/src/main/java/rife/bld/blueprints/AppProjectBlueprint.java
index 05813da..4477d12 100644
--- a/src/main/java/rife/bld/blueprints/AppProjectBlueprint.java
+++ b/src/main/java/rife/bld/blueprints/AppProjectBlueprint.java
@@ -31,7 +31,7 @@ public class AppProjectBlueprint extends Project {
 
         pkg = packageName;
         name = projectName;
-        mainClass = packageName + "." + baseName + "Main";
+        mainClass = packageName + "." + baseName;
         version = versionNumber;
 
         downloadSources = true;
diff --git a/src/main/java/rife/bld/blueprints/BaseProjectBlueprint.java b/src/main/java/rife/bld/blueprints/BaseProjectBlueprint.java
index 3ff955f..0e4c1e1 100644
--- a/src/main/java/rife/bld/blueprints/BaseProjectBlueprint.java
+++ b/src/main/java/rife/bld/blueprints/BaseProjectBlueprint.java
@@ -30,7 +30,7 @@ public class BaseProjectBlueprint extends Project {
 
         pkg = packageName;
         name = projectName;
-        mainClass = packageName + "." + baseName + "Main";
+        mainClass = packageName + "." + baseName;
         version = versionNumber;
 
         downloadSources = true;
diff --git a/src/main/java/rife/bld/blueprints/LibProjectBlueprint.java b/src/main/java/rife/bld/blueprints/LibProjectBlueprint.java
index 8f56e92..79582de 100644
--- a/src/main/java/rife/bld/blueprints/LibProjectBlueprint.java
+++ b/src/main/java/rife/bld/blueprints/LibProjectBlueprint.java
@@ -31,7 +31,7 @@ public class LibProjectBlueprint extends Project {
 
         pkg = packageName;
         name = projectName;
-        mainClass = packageName + "." + baseName + "Lib";
+        mainClass = packageName + "." + baseName;
         version = versionNumber;
 
         downloadSources = true;
diff --git a/src/main/java/rife/bld/operations/AbstractCreateOperation.java b/src/main/java/rife/bld/operations/AbstractCreateOperation.java
index 5d4a3b9..531a7c8 100644
--- a/src/main/java/rife/bld/operations/AbstractCreateOperation.java
+++ b/src/main/java/rife/bld/operations/AbstractCreateOperation.java
@@ -37,7 +37,6 @@ public abstract class AbstractCreateOperation<T extends AbstractCreateOperation<
 
     P project_;
 
-    String projectClassName_;
     String projectBuildName_;
     String projectMainName_;
     String projectMainUberName_;
@@ -99,7 +98,6 @@ public abstract class AbstractCreateOperation<T extends AbstractCreateOperation<
         project_ = createProjectBlueprint();
 
         // standard names
-        projectClassName_ = StringUtils.capitalize(project_.name());
         var base_name = baseName();
         projectBuildName_ = projectBuildClassName(base_name);
         projectMainName_ = projectMainClassName(base_name);
@@ -135,7 +133,7 @@ public abstract class AbstractCreateOperation<T extends AbstractCreateOperation<
      * @since 1.6
      */
     protected String projectMainClassName(String projectClassName) {
-        return projectClassName + "Main";
+        return projectClassName;
     }
 
     /**
@@ -145,7 +143,7 @@ public abstract class AbstractCreateOperation<T extends AbstractCreateOperation<
      * @since 1.6
      */
     protected String projectMainUberClassName(String projectClassName) {
-        return projectClassName + "Main";
+        return projectClassName;
     }
 
     /**
@@ -202,7 +200,7 @@ public abstract class AbstractCreateOperation<T extends AbstractCreateOperation<
         test_template.setValue("projectTest", projectTestName_);
         test_template.setValue("projectMain", projectMainName_);
         if (test_template.hasValueId("project")) {
-            test_template.setValue("project", projectClassName_);
+            test_template.setValue("project", project_.name());
         }
         var project_test_file = new File(testPackageDirectory_, projectTestName_ + ".java");
         FileUtils.writeString(test_template.getContent(), project_test_file);
@@ -214,7 +212,7 @@ public abstract class AbstractCreateOperation<T extends AbstractCreateOperation<
             build_template.setValue("package", project_.pkg());
         }
         if (build_template.hasValueId("project")) {
-            build_template.setValue("project", projectClassName_);
+            build_template.setValue("project", project_.name());
         }
         if (build_template.hasValueId("projectMain")) {
             build_template.setValue("projectMain", projectMainName_);
@@ -551,10 +549,7 @@ public abstract class AbstractCreateOperation<T extends AbstractCreateOperation<
 
     static String generateBaseName(String projectName) {
         if (projectName != null) {
-            var base_name = projectName.trim();
-            base_name = StringUtils.filterAsIdentifier(base_name);
-            base_name = StringUtils.capitalize(base_name);
-            return base_name;
+            return StringUtils.filterAsIdentifier(projectName.trim(), true);
         }
 
         return null;
diff --git a/src/main/java/rife/bld/operations/CreateRife2Operation.java b/src/main/java/rife/bld/operations/CreateRife2Operation.java
index cf94321..584778b 100644
--- a/src/main/java/rife/bld/operations/CreateRife2Operation.java
+++ b/src/main/java/rife/bld/operations/CreateRife2Operation.java
@@ -7,6 +7,7 @@ package rife.bld.operations;
 import rife.bld.blueprints.Rife2ProjectBlueprint;
 import rife.template.TemplateFactory;
 import rife.tools.FileUtils;
+import rife.tools.StringUtils;
 import rife.tools.exceptions.FileUtilsErrorException;
 
 import java.io.File;
@@ -63,7 +64,7 @@ public class CreateRife2Operation extends AbstractCreateOperation<CreateRife2Ope
 
         // project template
         var template_template = TemplateFactory.HTML.get(templateBase_ + "project_template");
-        template_template.setValue("project", projectClassName_);
+        template_template.setValue("project", StringUtils.capitalize(project_.name()));
         var project_template_file = new File(project_.srcMainResourcesTemplatesDirectory(), "hello.html");
         FileUtils.writeString(template_template.getContent(), project_template_file);
 
diff --git a/src/test/java/rife/bld/operations/TestCompileOperation.java b/src/test/java/rife/bld/operations/TestCompileOperation.java
index de7cedf..c670daa 100644
--- a/src/test/java/rife/bld/operations/TestCompileOperation.java
+++ b/src/test/java/rife/bld/operations/TestCompileOperation.java
@@ -223,7 +223,7 @@ public class TestCompileOperation {
             var compile_operation = new CompileOperation()
                 .fromProject(create_operation.project());
 
-            var main_app_class = new File(new File(compile_operation.buildMainDirectory(), "tst"), "AppMain.class");
+            var main_app_class = new File(new File(compile_operation.buildMainDirectory(), "tst"), "App.class");
             var test_app_class = new File(new File(compile_operation.buildTestDirectory(), "tst"), "AppTest.class");
             assertFalse(main_app_class.exists());
             assertFalse(test_app_class.exists());
diff --git a/src/test/java/rife/bld/operations/TestCreateAppOperation.java b/src/test/java/rife/bld/operations/TestCreateAppOperation.java
index fb7c585..ea3dfc5 100644
--- a/src/test/java/rife/bld/operations/TestCreateAppOperation.java
+++ b/src/test/java/rife/bld/operations/TestCreateAppOperation.java
@@ -132,7 +132,7 @@ public class TestCreateAppOperation {
                     /my-app/src/main/java
                     /my-app/src/main/java/com
                     /my-app/src/main/java/com/example
-                    /my-app/src/main/java/com/example/MyAppMain\\.java
+                    /my-app/src/main/java/com/example/MyApp\\.java
                     /my-app/src/main/resources
                     /my-app/src/main/resources/templates
                     /my-app/src/test
@@ -170,7 +170,7 @@ public class TestCreateAppOperation {
                     /my-app/build/main
                     /my-app/build/main/com
                     /my-app/build/main/com/example
-                    /my-app/build/main/com/example/MyAppMain\\.class
+                    /my-app/build/main/com/example/MyApp\\.class
                     /my-app/build/test
                     /my-app/build/test/com
                     /my-app/build/test/com/example
@@ -216,7 +216,7 @@ public class TestCreateAppOperation {
                     /my-app/src/main/java
                     /my-app/src/main/java/com
                     /my-app/src/main/java/com/example
-                    /my-app/src/main/java/com/example/MyAppMain\\.java
+                    /my-app/src/main/java/com/example/MyApp\\.java
                     /my-app/src/main/resources
                     /my-app/src/main/resources/templates
                     /my-app/src/test
@@ -296,7 +296,7 @@ public class TestCreateAppOperation {
                     /your-thing/src/main/java
                     /your-thing/src/main/java/org
                     /your-thing/src/main/java/org/stuff
-                    /your-thing/src/main/java/org/stuff/YourThingMain.java
+                    /your-thing/src/main/java/org/stuff/YourThing.java
                     /your-thing/src/main/resources
                     /your-thing/src/main/resources/templates
                     /your-thing/src/test
@@ -378,7 +378,7 @@ public class TestCreateAppOperation {
                 /my-app/build/main
                 /my-app/build/main/com
                 /my-app/build/main/com/example
-                /my-app/build/main/com/example/MyAppMain\\.class
+                /my-app/build/main/com/example/MyApp\\.class
                 /my-app/build/test
                 /my-app/build/test/com
                 /my-app/build/test/com/example
@@ -425,7 +425,7 @@ public class TestCreateAppOperation {
                 /my-app/src/main/java
                 /my-app/src/main/java/com
                 /my-app/src/main/java/com/example
-                /my-app/src/main/java/com/example/MyAppMain\\.java
+                /my-app/src/main/java/com/example/MyApp\\.java
                 /my-app/src/main/resources
                 /my-app/src/main/resources/templates
                 /my-app/src/test
@@ -504,7 +504,7 @@ public class TestCreateAppOperation {
                 /my-app/build/main
                 /my-app/build/main/com
                 /my-app/build/main/com/example
-                /my-app/build/main/com/example/MyAppMain\\.class
+                /my-app/build/main/com/example/MyApp\\.class
                 /my-app/build/test
                 /my-app/build/test/com
                 /my-app/build/test/com/example
@@ -552,7 +552,7 @@ public class TestCreateAppOperation {
                 /my-app/src/main/java
                 /my-app/src/main/java/com
                 /my-app/src/main/java/com/example
-                /my-app/src/main/java/com/example/MyAppMain\\.java
+                /my-app/src/main/java/com/example/MyApp\\.java
                 /my-app/src/main/resources
                 /my-app/src/main/resources/templates
                 /my-app/src/test
diff --git a/src/test/java/rife/bld/operations/TestCreateBaseOperation.java b/src/test/java/rife/bld/operations/TestCreateBaseOperation.java
index f889e97..379629f 100644
--- a/src/test/java/rife/bld/operations/TestCreateBaseOperation.java
+++ b/src/test/java/rife/bld/operations/TestCreateBaseOperation.java
@@ -107,7 +107,7 @@ public class TestCreateBaseOperation {
                     /my-app/src/main/java
                     /my-app/src/main/java/com
                     /my-app/src/main/java/com/example
-                    /my-app/src/main/java/com/example/MyAppMain\\.java
+                    /my-app/src/main/java/com/example/MyApp\\.java
                     /my-app/src/main/resources
                     /my-app/src/main/resources/templates
                     /my-app/src/test
@@ -145,7 +145,7 @@ public class TestCreateBaseOperation {
                     /my-app/build/main
                     /my-app/build/main/com
                     /my-app/build/main/com/example
-                    /my-app/build/main/com/example/MyAppMain\\.class
+                    /my-app/build/main/com/example/MyApp\\.class
                     /my-app/build/test
                     /my-app/build/test/com
                     /my-app/build/test/com/example
@@ -173,7 +173,7 @@ public class TestCreateBaseOperation {
                     /my-app/src/main/java
                     /my-app/src/main/java/com
                     /my-app/src/main/java/com/example
-                    /my-app/src/main/java/com/example/MyAppMain\\.java
+                    /my-app/src/main/java/com/example/MyApp\\.java
                     /my-app/src/main/resources
                     /my-app/src/main/resources/templates
                     /my-app/src/test
@@ -253,7 +253,7 @@ public class TestCreateBaseOperation {
                     /your-thing/src/main/java
                     /your-thing/src/main/java/org
                     /your-thing/src/main/java/org/stuff
-                    /your-thing/src/main/java/org/stuff/YourThingMain.java
+                    /your-thing/src/main/java/org/stuff/YourThing.java
                     /your-thing/src/main/resources
                     /your-thing/src/main/resources/templates
                     /your-thing/src/test
@@ -292,7 +292,7 @@ public class TestCreateBaseOperation {
                     /your-thing/build/main
                     /your-thing/build/main/org
                     /your-thing/build/main/org/stuff
-                    /your-thing/build/main/org/stuff/YourThingMain.class
+                    /your-thing/build/main/org/stuff/YourThing.class
                     /your-thing/build/test
                     /your-thing/build/test/org
                     /your-thing/build/test/org/stuff
@@ -320,7 +320,7 @@ public class TestCreateBaseOperation {
                     /your-thing/src/main/java
                     /your-thing/src/main/java/org
                     /your-thing/src/main/java/org/stuff
-                    /your-thing/src/main/java/org/stuff/YourThingMain.java
+                    /your-thing/src/main/java/org/stuff/YourThing.java
                     /your-thing/src/main/resources
                     /your-thing/src/main/resources/templates
                     /your-thing/src/test
diff --git a/src/test/java/rife/bld/operations/TestJarOperation.java b/src/test/java/rife/bld/operations/TestJarOperation.java
index 4257b6e..768c99d 100644
--- a/src/test/java/rife/bld/operations/TestJarOperation.java
+++ b/src/test/java/rife/bld/operations/TestJarOperation.java
@@ -209,7 +209,7 @@ public class TestJarOperation {
 
             assertEquals("""
                 META-INF/MANIFEST.MF
-                tst/AppMain.class
+                tst/App.class
                 """, content.toString());
         } finally {
             FileUtils.deleteDirectory(tmp);
diff --git a/src/test/java/rife/bld/operations/TestJavadocOperation.java b/src/test/java/rife/bld/operations/TestJavadocOperation.java
index 9c94c22..eacca43 100644
--- a/src/test/java/rife/bld/operations/TestJavadocOperation.java
+++ b/src/test/java/rife/bld/operations/TestJavadocOperation.java
@@ -273,7 +273,7 @@ public class TestJavadocOperation {
             var javadoc_operation = new JavadocOperation()
                 .fromProject(create_operation.project());
 
-            var main_app_html = new File(new File(javadoc_operation.buildDirectory(), "tst"), "AppMain.html");
+            var main_app_html = new File(new File(javadoc_operation.buildDirectory(), "tst"), "App.html");
             var index_html = new File(javadoc_operation.buildDirectory(), "index.html");
             var index_all_html = new File(javadoc_operation.buildDirectory(), "index-all.html");
             assertFalse(main_app_html.exists());