diff --git a/app/build.gradle b/app/build.gradle
index 6477f1a30..c7d4fc159 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,7 +21,7 @@ import static org.gradle.api.tasks.testing.TestResult.ResultType
android {
compileSdkVersion Config.compileSdkVersion
defaultConfig {
- applicationId "io.github.fork_maintainers"
+ applicationId "io.github.forkmaintainers"
minSdkVersion Config.minSdkVersion
targetSdkVersion Config.targetSdkVersion
versionCode 1
diff --git a/app/src/forkRelease/res/xml/shortcuts.xml b/app/src/forkRelease/res/xml/shortcuts.xml
index c1b1943b4..5f1a6c69e 100644
--- a/app/src/forkRelease/res/xml/shortcuts.xml
+++ b/app/src/forkRelease/res/xml/shortcuts.xml
@@ -11,7 +11,7 @@
android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2">
diff --git a/app/src/main/java/io/github/fork_maintainers/iceraven/components/PagedAddonCollectionProvider.kt b/app/src/main/java/io/github/forkmaintainers/iceraven/components/PagedAddonCollectionProvider.kt
similarity index 99%
rename from app/src/main/java/io/github/fork_maintainers/iceraven/components/PagedAddonCollectionProvider.kt
rename to app/src/main/java/io/github/forkmaintainers/iceraven/components/PagedAddonCollectionProvider.kt
index e696a0dd0..57be8f920 100644
--- a/app/src/main/java/io/github/fork_maintainers/iceraven/components/PagedAddonCollectionProvider.kt
+++ b/app/src/main/java/io/github/forkmaintainers/iceraven/components/PagedAddonCollectionProvider.kt
@@ -4,7 +4,7 @@
@file:Suppress("TooManyFunctions")
-package io.github.fork_maintainers.iceraven.components
+package io.github.forkmaintainers.iceraven.components
import android.content.Context
import android.util.AtomicFile
diff --git a/app/src/main/java/io/github/fork_maintainers/iceraven/components/PagedAddonInstallationDialogFragment.kt b/app/src/main/java/io/github/forkmaintainers/iceraven/components/PagedAddonInstallationDialogFragment.kt
similarity index 99%
rename from app/src/main/java/io/github/fork_maintainers/iceraven/components/PagedAddonInstallationDialogFragment.kt
rename to app/src/main/java/io/github/forkmaintainers/iceraven/components/PagedAddonInstallationDialogFragment.kt
index 4863342e5..8ce89ec23 100644
--- a/app/src/main/java/io/github/fork_maintainers/iceraven/components/PagedAddonInstallationDialogFragment.kt
+++ b/app/src/main/java/io/github/forkmaintainers/iceraven/components/PagedAddonInstallationDialogFragment.kt
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package io.github.fork_maintainers.iceraven.components
+package io.github.forkmaintainers.iceraven.components
import android.annotation.SuppressLint
import android.app.Dialog
diff --git a/app/src/main/java/io/github/fork_maintainers/iceraven/components/PagedAddonsManagerAdapter.kt b/app/src/main/java/io/github/forkmaintainers/iceraven/components/PagedAddonsManagerAdapter.kt
similarity index 99%
rename from app/src/main/java/io/github/fork_maintainers/iceraven/components/PagedAddonsManagerAdapter.kt
rename to app/src/main/java/io/github/forkmaintainers/iceraven/components/PagedAddonsManagerAdapter.kt
index 35592bcf3..0e2355e5c 100644
--- a/app/src/main/java/io/github/fork_maintainers/iceraven/components/PagedAddonsManagerAdapter.kt
+++ b/app/src/main/java/io/github/forkmaintainers/iceraven/components/PagedAddonsManagerAdapter.kt
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-package io.github.fork_maintainers.iceraven.components
+package io.github.forkmaintainers.iceraven.components
import android.annotation.SuppressLint
import android.graphics.Bitmap
diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
index ce0da966a..8da2b8ddd 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
@@ -34,8 +34,8 @@ import mozilla.components.feature.addons.Addon
import mozilla.components.feature.addons.AddonManagerException
import mozilla.components.feature.addons.ui.PermissionsDialogFragment
import mozilla.components.feature.addons.ui.translatedName
-import io.github.fork_maintainers.iceraven.components.PagedAddonInstallationDialogFragment
-import io.github.fork_maintainers.iceraven.components.PagedAddonsManagerAdapter
+import io.github.forkmaintainers.iceraven.components.PagedAddonInstallationDialogFragment
+import io.github.forkmaintainers.iceraven.components.PagedAddonsManagerAdapter
import org.mozilla.fenix.R
import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.ext.components
diff --git a/app/src/main/java/org/mozilla/fenix/components/Components.kt b/app/src/main/java/org/mozilla/fenix/components/Components.kt
index 57aa88dd5..bbedb955f 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Components.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Components.kt
@@ -15,7 +15,7 @@ import mozilla.components.feature.addons.update.AddonUpdater
import mozilla.components.feature.addons.update.DefaultAddonUpdater
import mozilla.components.lib.publicsuffixlist.PublicSuffixList
import mozilla.components.support.migration.state.MigrationStore
-import io.github.fork_maintainers.iceraven.components.PagedAddonCollectionProvider
+import io.github.forkmaintainers.iceraven.components.PagedAddonCollectionProvider
import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.components.metrics.AppStartupTelemetry
import org.mozilla.fenix.ext.settings