diff --git a/src/main/kotlin/ltd/hlaeja/HlaejaServiceApplication.kt b/src/main/kotlin/ltd/hlaeja/Application.kt
similarity index 58%
rename from src/main/kotlin/ltd/hlaeja/HlaejaServiceApplication.kt
rename to src/main/kotlin/ltd/hlaeja/Application.kt
index 90a53dc..42eea90 100644
--- a/src/main/kotlin/ltd/hlaeja/HlaejaServiceApplication.kt
+++ b/src/main/kotlin/ltd/hlaeja/Application.kt
@@ -4,8 +4,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
 
 @SpringBootApplication
-class HlaejaServiceApplication
+class Application
 
-fun main(args: Array<String>) {
-    runApplication<HlaejaServiceApplication>(*args)
+fun main(vararg args: String) {
+    runApplication<Application>(*args)
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
deleted file mode 100644
index 25b2a08..0000000
--- a/src/main/resources/application.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring.application.name=hlaeja-service
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
new file mode 100644
index 0000000..89b39a0
--- /dev/null
+++ b/src/main/resources/application.yml
@@ -0,0 +1,3 @@
+spring:
+  application:
+    name: hlaeja-service
diff --git a/src/test/kotlin/ltd/hlaeja/HlaejaServiceApplicationTests.kt b/src/test/kotlin/ltd/hlaeja/ApplicationTests.kt
similarity index 82%
rename from src/test/kotlin/ltd/hlaeja/HlaejaServiceApplicationTests.kt
rename to src/test/kotlin/ltd/hlaeja/ApplicationTests.kt
index 2e3c15c..1af5ea1 100644
--- a/src/test/kotlin/ltd/hlaeja/HlaejaServiceApplicationTests.kt
+++ b/src/test/kotlin/ltd/hlaeja/ApplicationTests.kt
@@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test
 import org.springframework.boot.test.context.SpringBootTest
 
 @SpringBootTest
-class HlaejaServiceApplicationTests {
+class ApplicationTests {
 
     @Test
     fun contextLoads() {