diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 0e8520d4..6414e15a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -19,7 +19,6 @@
 
 import java.time.Instant
 
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.agp.app)
     alias(libs.plugins.nav.safeargs)
diff --git a/build.gradle.kts b/build.gradle.kts
index 1d83d1e2..3aac2016 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -21,7 +21,6 @@ import com.android.build.api.dsl.ApplicationDefaultConfig
 import com.android.build.api.dsl.CommonExtension
 import com.android.build.gradle.api.AndroidBasePlugin
 
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.lsplugin.cmaker)
     alias(libs.plugins.lsplugin.jgit)
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 715adfb1..d3163a92 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -20,7 +20,6 @@
 val verName: String by rootProject.extra
 val verCode: Int by rootProject.extra
 
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.agp.lib)
 }
diff --git a/daemon/build.gradle.kts b/daemon/build.gradle.kts
index 71a3b251..63958ac5 100644
--- a/daemon/build.gradle.kts
+++ b/daemon/build.gradle.kts
@@ -22,7 +22,6 @@ import com.android.ide.common.signing.KeystoreHelper
 import java.io.PrintStream
 import java.util.*
 
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.agp.app)
     alias(libs.plugins.lsplugin.resopt)
@@ -86,8 +85,8 @@ android {
 }
 
 android.applicationVariants.all {
-    val variantCapped = name.capitalize(Locale.ROOT)
-    val variantLowered = name.toLowerCase(Locale.ROOT)
+    val variantCapped = name.replaceFirstChar { it.uppercase() }
+    val variantLowered = name.lowercase()
 
     val outSrcDir = file("$buildDir/generated/source/signInfo/${variantLowered}")
     val signInfoTask = tasks.register("generate${variantCapped}SignInfo") {
diff --git a/dex2oat/build.gradle.kts b/dex2oat/build.gradle.kts
index e4f75ed5..de23274c 100644
--- a/dex2oat/build.gradle.kts
+++ b/dex2oat/build.gradle.kts
@@ -17,7 +17,6 @@
  * Copyright (C) 2022 LSPosed Contributors
  */
 
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.agp.lib)
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fc10b601..0c85a1f7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/magisk-loader/build.gradle.kts b/magisk-loader/build.gradle.kts
index 8fa36f60..a0d7db48 100644
--- a/magisk-loader/build.gradle.kts
+++ b/magisk-loader/build.gradle.kts
@@ -33,7 +33,6 @@ import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.MethodVisitor
 import org.objectweb.asm.Opcodes
 
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.agp.app)
     alias(libs.plugins.lsplugin.resopt)
@@ -92,8 +91,8 @@ android {
         all {
             externalNativeBuild {
                 cmake {
-                    arguments += "-DMODULE_NAME=${name.toLowerCase()}_$moduleBaseId"
-                    arguments += "-DAPI=${name.toLowerCase()}"
+                    arguments += "-DMODULE_NAME=${name.lowercase()}_$moduleBaseId"
+                    arguments += "-DAPI=${name.lowercase()}"
                 }
             }
         }
@@ -137,12 +136,12 @@ val zipAll = task("zipAll") {
 }
 
 fun afterEval() = android.applicationVariants.forEach { variant ->
-    val variantCapped = variant.name.capitalize(Locale.ROOT)
-    val variantLowered = variant.name.toLowerCase(Locale.ROOT)
-    val buildTypeCapped = variant.buildType.name.capitalize(Locale.ROOT)
-    val buildTypeLowered = variant.buildType.name.toLowerCase(Locale.ROOT)
-    val flavorCapped = variant.flavorName!!.capitalize(Locale.ROOT)
-    val flavorLowered = variant.flavorName!!.toLowerCase(Locale.ROOT)
+    val variantCapped = variant.name.replaceFirstChar { it.uppercase() }
+    val variantLowered = variant.name.lowercase()
+    val buildTypeCapped = variant.buildType.name.replaceFirstChar { it.uppercase() }
+    val buildTypeLowered = variant.buildType.name.lowercase()
+    val flavorCapped = variant.flavorName!!.replaceFirstChar { it.uppercase() }
+    val flavorLowered = variant.flavorName!!.lowercase()
 
     val magiskDir = "$buildDir/magisk/$variantLowered"
 
diff --git a/services/daemon-service/build.gradle.kts b/services/daemon-service/build.gradle.kts
index c97744d4..4756bb19 100644
--- a/services/daemon-service/build.gradle.kts
+++ b/services/daemon-service/build.gradle.kts
@@ -17,7 +17,6 @@
  * Copyright (C) 2021 LSPosed Contributors
  */
 
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.agp.lib)
 }
diff --git a/services/manager-service/build.gradle.kts b/services/manager-service/build.gradle.kts
index 89161fef..e446bbad 100644
--- a/services/manager-service/build.gradle.kts
+++ b/services/manager-service/build.gradle.kts
@@ -17,7 +17,6 @@
  * Copyright (C) 2021 LSPosed Contributors
  */
 
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.agp.lib)
 }