diff --git a/src/vi/academyvn/build.gradle b/src/vi/academyvn/build.gradle
index 1ccdd9192..119e60671 100644
--- a/src/vi/academyvn/build.gradle
+++ b/src/vi/academyvn/build.gradle
@@ -3,11 +3,11 @@ apply plugin: 'kotlin-android'
 
 ext {
     appName = 'Tachiyomi: AcademyVN'
-    pkgNameSuffix = "vi.AcademyVN"
-    extClass = '.AcademyVN'
+    pkgNameSuffix = "vi.academyvn"
+    extClass = '.Academyvn'
     extVersionCode = 1
     extVersionSuffix = 1
     libVersion = '1.0'
 }
 
-apply from: "$rootDir/common.gradle"
\ No newline at end of file
+apply from: "$rootDir/common.gradle"
diff --git a/src/vi/academyvn/src/eu/kanade/tachiyomi/extension/vi/academyvn/AcademyVn.kt b/src/vi/academyvn/src/eu/kanade/tachiyomi/extension/vi/academyvn/Academyvn.kt
similarity index 98%
rename from src/vi/academyvn/src/eu/kanade/tachiyomi/extension/vi/academyvn/AcademyVn.kt
rename to src/vi/academyvn/src/eu/kanade/tachiyomi/extension/vi/academyvn/Academyvn.kt
index a859f40f0..ecceae088 100644
--- a/src/vi/academyvn/src/eu/kanade/tachiyomi/extension/vi/academyvn/AcademyVn.kt
+++ b/src/vi/academyvn/src/eu/kanade/tachiyomi/extension/vi/academyvn/Academyvn.kt
@@ -52,7 +52,7 @@ class Academyvn : ParsedHttpSource() {
     override fun latestUpdatesNextPageSelector(): String = "li > a:contains(»)"
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/searchs?").newBuilder().addQueryParameter("keyword", query)
+        val url = HttpUrl.parse("$baseUrl/searchs?")!!.newBuilder().addQueryParameter("keyword", query)
         (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
             when (filter) {
                 is Type -> url.addQueryParameter("type", if (filter.state == 0) "-1" else type.indexOf(filter.state.toString()).toString())
@@ -194,4 +194,4 @@ class Academyvn : ParsedHttpSource() {
             Genre("Yuri"),
             Genre("Hot")
     )
-}
\ No newline at end of file
+}