diff --git a/app/build.gradle b/app/build.gradle
index 0f030053f..6477f1a30 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 "network.novak"
+        applicationId "io.github.fork_maintainers"
         minSdkVersion Config.minSdkVersion
         targetSdkVersion Config.targetSdkVersion
         versionCode 1
@@ -109,20 +109,22 @@ android {
         forkDebug {
             shrinkResources false
             minifyEnabled false
-            applicationIdSuffix ".fenix.debug"
+            applicationIdSuffix ".iceraven.debug"
             resValue "bool", "IS_DEBUG", "true"
             pseudoLocalesEnabled true
             // Need to replicate default debug config features
             signingConfig signingConfigs.debug
             debuggable true
+            def deepLinkSchemeValue = "iceraven-debug"
+            buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""
             // Use custom default allowed addon list
             buildConfigField "String", "AMO_ACCOUNT", "\"16201230\""
             buildConfigField "String", "AMO_COLLECTION", "\"What-I-want-on-Fenix\""
         }
         forkRelease releaseTemplate >> {
             buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"
-            applicationIdSuffix ".iceweasel"
-            def deepLinkSchemeValue = "fenix"
+            applicationIdSuffix ".iceraven"
+            def deepLinkSchemeValue = "iceraven"
             buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""
             manifestPlaceholders = [
                     "deepLinkScheme": deepLinkSchemeValue
diff --git a/app/src/forkRelease/res/xml/shortcuts.xml b/app/src/forkRelease/res/xml/shortcuts.xml
index 73ec04951..c1b1943b4 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">
         <intent
             android:action="org.mozilla.fenix.OPEN_TAB"
-            android:targetPackage="network.novak.iceweasel"
+            android:targetPackage="io.github.fork_maintainers.iceraven"
             android:targetClass="org.mozilla.fenix.IntentReceiverActivity" />
     </shortcut>
     <shortcut
@@ -22,7 +22,7 @@
         android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2">
         <intent
             android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB"
-            android:targetPackage="network.novak.iceweasel"
+            android:targetPackage="io.github.fork_maintainers.iceraven"
             android:targetClass="org.mozilla.fenix.IntentReceiverActivity" />
     </shortcut>
 </shortcuts>
diff --git a/app/src/main/java/network/novak/fenix/components/PagedAddonCollectionProvider.kt b/app/src/main/java/io/github/fork_maintainers/iceraven/components/PagedAddonCollectionProvider.kt
similarity index 100%
rename from app/src/main/java/network/novak/fenix/components/PagedAddonCollectionProvider.kt
rename to app/src/main/java/io/github/fork_maintainers/iceraven/components/PagedAddonCollectionProvider.kt
diff --git a/app/src/main/java/network/novak/fenix/components/PagedAddonInstallationDialogFragment.kt b/app/src/main/java/io/github/fork_maintainers/iceraven/components/PagedAddonInstallationDialogFragment.kt
similarity index 100%
rename from app/src/main/java/network/novak/fenix/components/PagedAddonInstallationDialogFragment.kt
rename to app/src/main/java/io/github/fork_maintainers/iceraven/components/PagedAddonInstallationDialogFragment.kt
diff --git a/app/src/main/java/network/novak/fenix/components/PagedAddonsManagerAdapter.kt b/app/src/main/java/io/github/fork_maintainers/iceraven/components/PagedAddonsManagerAdapter.kt
similarity index 100%
rename from app/src/main/java/network/novak/fenix/components/PagedAddonsManagerAdapter.kt
rename to app/src/main/java/io/github/fork_maintainers/iceraven/components/PagedAddonsManagerAdapter.kt
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt b/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
index 4bbf6c4f3..d13607e98 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
@@ -88,7 +88,7 @@ object SupportUtils {
     fun getWhatsNewUrl(context: Context) = if (Config.channel.isFennec) {
         getGenericSumoURLForTopic(SumoTopic.UPGRADE_FAQ)
     } else if (Config.channel.isFork) {
-        "https://github.com/fork-maintainers/iceweasel/releases"
+        "https://github.com/fork-maintainers/iceraven-browser/releases"
     } else {
         getSumoURLForTopic(context, SumoTopic.WHATS_NEW)
     }