diff --git a/build.gradle.kts b/build.gradle.kts
index d07937f..9568983 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,7 +19,7 @@ java {
 }
 
 application {
-    mainClass.set("tech.bitgoblin.dragoon.Main")
+    mainClass.set("tech.bitgoblin.Main")
 }
 
 repositories {
@@ -46,7 +46,7 @@ val fatJar by tasks.registering(Jar::class) {
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 
     manifest {
-        attributes["Main-Class"] = "tech.bitgoblin.dragoon.Main"
+        attributes["Main-Class"] = "tech.bitgoblin.Main"
     }
 
     from(sourceSets.main.get().output)
diff --git a/src/main/java/tech/bitgoblin/App.java b/src/main/java/tech/bitgoblin/Main.java
similarity index 97%
rename from src/main/java/tech/bitgoblin/App.java
rename to src/main/java/tech/bitgoblin/Main.java
index ecd1137..5d0739f 100644
--- a/src/main/java/tech/bitgoblin/App.java
+++ b/src/main/java/tech/bitgoblin/Main.java
@@ -12,7 +12,7 @@ import java.util.Timer;
  * The Bit Goblin video transcoder service.
  *
  */
-public class App {
+public class Main {
 
   private static final int msToMinutes = 60 * 1000;
 
diff --git a/src/test/java/tech/bitgoblin/AppTest.java b/src/test/java/tech/bitgoblin/MainTest.java
similarity index 81%
rename from src/test/java/tech/bitgoblin/AppTest.java
rename to src/test/java/tech/bitgoblin/MainTest.java
index 48e0d65..55da398 100644
--- a/src/test/java/tech/bitgoblin/AppTest.java
+++ b/src/test/java/tech/bitgoblin/MainTest.java
@@ -5,10 +5,9 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 
 /**
- * Unit test for simple App.
+ * Unit test for simple Main.
  */
-public class AppTest 
-{
+public class MainTest {
     /**
      * Rigorous Test :-)
      */