diff --git a/Encode/Dockerfile b/Encode/Dockerfile
index 279d2d06..cd8a8172 100644
--- a/Encode/Dockerfile
+++ b/Encode/Dockerfile
@@ -1,4 +1,4 @@
 FROM bskjon/debian-azuljava17-ffmpeg:latest
 EXPOSE 8080
 
-COPY ./build/libs/encode.jar /usr/share/app/app.jar
\ No newline at end of file
+COPY ./build/libs/encoder.jar /usr/share/app/app.jar
\ No newline at end of file
diff --git a/Encode/build.gradle.kts b/Encode/build.gradle.kts
index 6b5d83e2..e2f41729 100644
--- a/Encode/build.gradle.kts
+++ b/Encode/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName
+
 plugins {
     kotlin("jvm") version "1.8.21"
     id("org.springframework.boot") version "2.5.5"
@@ -42,4 +44,15 @@ dependencies {
 
 tasks.test {
     useJUnitPlatform()
-}
\ No newline at end of file
+}
+
+tasks.bootJar {
+    archiveFileName.set("encoder.jar")
+    launchScript()
+}
+
+tasks.jar {
+    archivesName.set("encoder.jar")
+    archiveBaseName.set("encoder")
+}
+archivesName.set("encoder.jar")
\ No newline at end of file
diff --git a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/contentDeterminator/ContentDeterminate.kt b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/contentDeterminator/ContentDeterminate.kt
index 62be068f..17fb2e5e 100644
--- a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/contentDeterminator/ContentDeterminate.kt
+++ b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/contentDeterminator/ContentDeterminate.kt
@@ -62,11 +62,11 @@ class ContentDeterminate: DefaultKafkaReader("contentDeterminate"), ISequentialM
         val metadata = if (metadataMessage?.status?.statusType == StatusType.SUCCESS) metadataMessage.data as Metadata? else null
 
         val videoInfo = if (metadata?.type == null) {
-            FileNameDeterminate(fileResult.title, fileResult.sanitizedName).getDeterminedFileName()
+            FileNameDeterminate(fileResult.title, fileResult.sanitizedName).getDeterminedVideoInfo()
         } else if (metadata.type.lowercase() == "movie") {
-            FileNameDeterminate(fileResult.title, fileResult.sanitizedName, FileNameDeterminate.ContentType.MOVIE).getDeterminedFileName()
+            FileNameDeterminate(fileResult.title, fileResult.sanitizedName, FileNameDeterminate.ContentType.MOVIE).getDeterminedVideoInfo()
         } else {
-            FileNameDeterminate(fileResult.title, fileResult.sanitizedName, FileNameDeterminate.ContentType.SERIE).getDeterminedFileName()
+            FileNameDeterminate(fileResult.title, fileResult.sanitizedName, FileNameDeterminate.ContentType.SERIE).getDeterminedVideoInfo()
         }
 
         if (videoInfo == null) {
diff --git a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/contentDeterminator/FileNameDeterminate.kt b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/contentDeterminator/FileNameDeterminate.kt
index 61076fca..6f6b49d0 100644
--- a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/contentDeterminator/FileNameDeterminate.kt
+++ b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/contentDeterminator/FileNameDeterminate.kt
@@ -12,7 +12,7 @@ class FileNameDeterminate(val title: String, val sanitizedName: String, val ctyp
         UNDEFINED
     }
 
-    fun getDeterminedFileName(): VideoInfo? {
+    fun getDeterminedVideoInfo(): VideoInfo? {
         return when (ctype) {
             ContentType.MOVIE -> determineMovieFileName()
             ContentType.SERIE -> determineSerieFileName()
@@ -61,7 +61,8 @@ class FileNameDeterminate(val title: String, val sanitizedName: String, val ctyp
     private fun determineUndefinedFileName(): VideoInfo? {
         val serieEx = SerieEx(title, sanitizedName)
         val (season, episode) = serieEx.findSeasonAndEpisode(sanitizedName)
-        return if (sanitizedName.contains(" - ") || season != null || episode != null) {
+        val episodeNumber = serieEx.findEpisodeNumber()
+        return if ((sanitizedName.contains(" - ") && episodeNumber != null) || season != null || episode != null) {
             determineSerieFileName()
         } else {
             determineMovieFileName()
diff --git a/Reader/src/test/kotlin/no/iktdev/streamit/content/reader/analyzer/contentDeterminator/FileNameDeterminateTest.kt b/Reader/src/test/kotlin/no/iktdev/streamit/content/reader/analyzer/contentDeterminator/FileNameDeterminateTest.kt
index 45025fe2..45438551 100644
--- a/Reader/src/test/kotlin/no/iktdev/streamit/content/reader/analyzer/contentDeterminator/FileNameDeterminateTest.kt
+++ b/Reader/src/test/kotlin/no/iktdev/streamit/content/reader/analyzer/contentDeterminator/FileNameDeterminateTest.kt
@@ -22,7 +22,7 @@ class FileNameDeterminateTest {
             FileNameDeterminate("Iseleve", namedTestData.input, FileNameDeterminate.ContentType.SERIE)
         assertEquals(
             namedTestData.expected,
-            fileNameDeterminate.getDeterminedFileName(),
+            fileNameDeterminate.getDeterminedVideoInfo()?.fullName,
             "Test case: ${namedTestData.input}"
         )
     }
@@ -35,7 +35,7 @@ class FileNameDeterminateTest {
         )
         assertEquals(
             namedTestData.expected,
-            fileNameDeterminate.getDeterminedFileName(),
+            fileNameDeterminate.getDeterminedVideoInfo()?.fullName,
             "Test case: ${namedTestData.input}"
         )
     }
@@ -46,7 +46,7 @@ class FileNameDeterminateTest {
         val fileNameDeterminate = FileNameDeterminate(
             namedTestData.input, namedTestData.input, FileNameDeterminate.ContentType.UNDEFINED
         )
-        assertThat(fileNameDeterminate.getDeterminedFileName()).isEqualTo(namedTestData.expected)
+        assertThat(fileNameDeterminate.getDeterminedVideoInfo()?.fullName).isEqualTo(namedTestData.expected)
     }
 
     @Test
@@ -55,7 +55,7 @@ class FileNameDeterminateTest {
         val fileNameDeterminate = FileNameDeterminate(
             namedTestData.input, namedTestData.input, FileNameDeterminate.ContentType.UNDEFINED
         )
-        assertThat(fileNameDeterminate.getDeterminedFileName()).isEqualTo(namedTestData.expected)
+        assertThat(fileNameDeterminate.getDeterminedVideoInfo()?.fullName).isEqualTo(namedTestData.expected)
     }
 
     companion object {