diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 2a76b8d8..769787ce 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -34,8 +34,8 @@ android {
         applicationId = "com.sadellie.unitto"
         minSdk = 21
         targetSdk = 34
-        versionCode = libs.versions.appCode.get().toInt()
-        versionName = "Popstar"
+        versionCode = libs.versions.versionCode.get().toInt()
+        versionName = libs.versions.versionName.get()
         resourceConfigurations += setOf(
             "en",
             "en-rGB",
diff --git a/core/base/build.gradle.kts b/core/base/build.gradle.kts
index ef406e31..e713205c 100644
--- a/core/base/build.gradle.kts
+++ b/core/base/build.gradle.kts
@@ -25,16 +25,22 @@ android {
     namespace = "com.sadellie.unitto.core.base"
 
     defaultConfig {
-        buildConfigField("String", "APP_NAME", """"${libs.versions.appName.get()}"""")
-        buildConfigField("String", "APP_CODE", """"${libs.versions.appCode.get()}"""")
+        stringConfigField("VERSION_NAME", libs.versions.versionName.get())
+        stringConfigField("VERSION_CODE", libs.versions.versionCode.get())
     }
 
     productFlavors {
         getByName("playStore") {
-            storeLink("http://play.google.com/store/apps/details?id=com.sadellie.unitto")
+            stringConfigField(
+                "STORE_LINK",
+                "http://play.google.com/store/apps/details?id=com.sadellie.unitto"
+            )
         }
         getByName("fdroid") {
-            storeLink("https://github.com/sadellie/unitto")
+            stringConfigField(
+                "STORE_LINK",
+                "https://github.com/sadellie/unitto"
+            )
         }
     }
 
@@ -47,10 +53,8 @@ android {
     lint.warning.add("MissingTranslation")
 }
 
-fun com.android.build.api.dsl.VariantDimension.storeLink(url: String) {
+fun com.android.build.api.dsl.VariantDimension.stringConfigField(name: String, url: String) {
     buildConfigField(
-        "String",
-        "STORE_LINK",
-        "\"${url}\""
+        "String", name, "\"${url}\""
     )
 }
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/SettingsScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/SettingsScreen.kt
index 50c1e917..3fb8ef4d 100644
--- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/SettingsScreen.kt
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/SettingsScreen.kt
@@ -156,10 +156,12 @@ private fun SettingsScreen(
                 expanded = showMenu,
                 onDismissRequest = { showMenu = false }
             ) {
+                // TODO Translate
                 DropdownMenuItem(
                     onClick = { showMenu = false; backup() },
                     text = { Text("Backup") }
                 )
+                // TODO Translate
                 DropdownMenuItem(
                     onClick = { showMenu = false; launcher.launch(arrayOf(backupMimeType)) },
                     text = { Text("Restore") }
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/about/AboutScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/about/AboutScreen.kt
index c4a9e92f..a6b3d5b5 100644
--- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/about/AboutScreen.kt
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/about/AboutScreen.kt
@@ -155,7 +155,7 @@ private fun AboutScreen(
                 UnittoListItem(
                     icon = Icons.Default.Info,
                     headlineText = stringResource(R.string.settings_version_name),
-                    supportingText = "${BuildConfig.APP_NAME} (${BuildConfig.APP_CODE})",
+                    supportingText = "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})",
                     modifier = Modifier.combinedClickable {
                         if (prefs.enableToolsExperiment) {
                             showToast(mContext, "Experiments features are already enabled!", Toast.LENGTH_LONG)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e977977b..a54e47e8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-appCode = "31"
-appName = "Popstar"
+versionCode = "31"
+versionName = "Popstar"
 
 androidxBrowserBrowser = "1.7.0"
 androidGradlePlugin = "8.2.0"