diff --git a/anvilannotations/src/main/kotlin/io/element/android/x/anvilannotations/ContributesNode.kt b/anvilannotations/src/main/kotlin/io/element/android/anvilannotations/ContributesNode.kt
similarity index 95%
rename from anvilannotations/src/main/kotlin/io/element/android/x/anvilannotations/ContributesNode.kt
rename to anvilannotations/src/main/kotlin/io/element/android/anvilannotations/ContributesNode.kt
index 1367dc0dc7..cf9f2f3684 100644
--- a/anvilannotations/src/main/kotlin/io/element/android/x/anvilannotations/ContributesNode.kt
+++ b/anvilannotations/src/main/kotlin/io/element/android/anvilannotations/ContributesNode.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.x.anvilannotations
+package io.element.android.anvilannotations
 
 import kotlin.reflect.KClass
 
diff --git a/anvilcodegen/src/main/kotlin/io/element/android/x/anvilcodegen/ContributesNodeCodeGenerator.kt b/anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeCodeGenerator.kt
similarity index 98%
rename from anvilcodegen/src/main/kotlin/io/element/android/x/anvilcodegen/ContributesNodeCodeGenerator.kt
rename to anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeCodeGenerator.kt
index 895a6347fd..576a52df89 100644
--- a/anvilcodegen/src/main/kotlin/io/element/android/x/anvilcodegen/ContributesNodeCodeGenerator.kt
+++ b/anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeCodeGenerator.kt
@@ -16,7 +16,7 @@
 
 @file:OptIn(ExperimentalAnvilApi::class)
 
-package io.element.android.x.anvilcodegen
+package io.element.android.anvilcodegen
 
 import com.google.auto.service.AutoService
 import com.squareup.anvil.annotations.ContributesTo
@@ -46,7 +46,7 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.multibindings.IntoMap
-import io.element.android.x.anvilannotations.ContributesNode
+import io.element.android.anvilannotations.ContributesNode
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtFile
diff --git a/features/login/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt b/features/login/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt
index 3fc011ddf8..4ad31d222f 100644
--- a/features/login/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt
+++ b/features/login/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt
@@ -33,6 +33,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("io.element.android.x.features.login.test", appContext.packageName)
+        assertEquals("io.element.android.features.login.test", appContext.packageName)
     }
 }
diff --git a/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt
index 01163664b6..4cec3ad0be 100644
--- a/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt
+++ b/features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt
@@ -25,7 +25,7 @@ import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
-import io.element.android.x.anvilannotations.ContributesNode
+import io.element.android.anvilannotations.ContributesNode
 import io.element.android.libraries.architecture.presenterConnector
 import io.element.android.libraries.di.AppScope
 
diff --git a/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt
index 089f629e6b..87a1c3d248 100644
--- a/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt
+++ b/features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt
@@ -27,7 +27,7 @@ import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.core.plugin.plugins
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
-import io.element.android.x.anvilannotations.ContributesNode
+import io.element.android.anvilannotations.ContributesNode
 import io.element.android.libraries.architecture.presenterConnector
 import io.element.android.libraries.core.compose.OnLifecycleEvent
 import io.element.android.libraries.di.AppScope
diff --git a/features/logout/src/androidTest/kotlin/io/element/android/features/logout/ExampleInstrumentedTest.kt b/features/logout/src/androidTest/kotlin/io/element/android/features/logout/ExampleInstrumentedTest.kt
index 5fea153e9f..1316448d00 100644
--- a/features/logout/src/androidTest/kotlin/io/element/android/features/logout/ExampleInstrumentedTest.kt
+++ b/features/logout/src/androidTest/kotlin/io/element/android/features/logout/ExampleInstrumentedTest.kt
@@ -33,6 +33,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("io.element.android.x.features.login.test", appContext.packageName)
+        assertEquals("io.element.android.features.login.test", appContext.packageName)
     }
 }
diff --git a/features/messages/src/androidTest/kotlin/io/element/android/features/messages/ExampleInstrumentedTest.kt b/features/messages/src/androidTest/kotlin/io/element/android/features/messages/ExampleInstrumentedTest.kt
index 30e9a85c26..97ef4f5a3b 100644
--- a/features/messages/src/androidTest/kotlin/io/element/android/features/messages/ExampleInstrumentedTest.kt
+++ b/features/messages/src/androidTest/kotlin/io/element/android/features/messages/ExampleInstrumentedTest.kt
@@ -33,6 +33,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("io.element.android.x.features.messages.test", appContext.packageName)
+        assertEquals("io.element.android.features.messages.test", appContext.packageName)
     }
 }
diff --git a/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesNode.kt b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesNode.kt
index dbbf1a1d8a..ff8776b6aa 100644
--- a/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesNode.kt
+++ b/features/messages/src/main/kotlin/io/element/android/features/messages/MessagesNode.kt
@@ -25,7 +25,7 @@ import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
-import io.element.android.x.anvilannotations.ContributesNode
+import io.element.android.anvilannotations.ContributesNode
 import io.element.android.libraries.architecture.presenterConnector
 import io.element.android.libraries.di.RoomScope
 
diff --git a/features/onboarding/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt b/features/onboarding/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt
index 3fc011ddf8..4ad31d222f 100644
--- a/features/onboarding/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt
+++ b/features/onboarding/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt
@@ -33,6 +33,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("io.element.android.x.features.login.test", appContext.packageName)
+        assertEquals("io.element.android.features.login.test", appContext.packageName)
     }
 }
diff --git a/features/preferences/src/androidTest/kotlin/io/element/android/features/preferences/ExampleInstrumentedTest.kt b/features/preferences/src/androidTest/kotlin/io/element/android/features/preferences/ExampleInstrumentedTest.kt
index dc6a244d21..3b0a6ee9ae 100644
--- a/features/preferences/src/androidTest/kotlin/io/element/android/features/preferences/ExampleInstrumentedTest.kt
+++ b/features/preferences/src/androidTest/kotlin/io/element/android/features/preferences/ExampleInstrumentedTest.kt
@@ -33,6 +33,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("io.element.android.x.features.preferences.test", appContext.packageName)
+        assertEquals("io.element.android.features.preferences.test", appContext.packageName)
     }
 }
diff --git a/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt
index ae48353d78..b1ef84646b 100644
--- a/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt
+++ b/features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt
@@ -26,7 +26,7 @@ import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.core.plugin.plugins
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
-import io.element.android.x.anvilannotations.ContributesNode
+import io.element.android.anvilannotations.ContributesNode
 import io.element.android.libraries.architecture.presenterConnector
 import io.element.android.libraries.di.SessionScope
 
diff --git a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportNode.kt b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportNode.kt
index 5e620310df..b7a32c9b05 100644
--- a/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportNode.kt
+++ b/features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportNode.kt
@@ -26,7 +26,7 @@ import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.core.plugin.plugins
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
-import io.element.android.x.anvilannotations.ContributesNode
+import io.element.android.anvilannotations.ContributesNode
 import io.element.android.libraries.architecture.presenterConnector
 import io.element.android.libraries.di.AppScope
 
diff --git a/features/roomlist/src/androidTest/kotlin/io/element/android/features/roomlist/ExampleInstrumentedTest.kt b/features/roomlist/src/androidTest/kotlin/io/element/android/features/roomlist/ExampleInstrumentedTest.kt
index b0cd0e20f1..e66201078b 100644
--- a/features/roomlist/src/androidTest/kotlin/io/element/android/features/roomlist/ExampleInstrumentedTest.kt
+++ b/features/roomlist/src/androidTest/kotlin/io/element/android/features/roomlist/ExampleInstrumentedTest.kt
@@ -33,6 +33,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("io.element.android.x.features.roomlist.test", appContext.packageName)
+        assertEquals("io.element.android.features.roomlist.test", appContext.packageName)
     }
 }
diff --git a/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt
index b299658643..4e153a2328 100644
--- a/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt
+++ b/features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt
@@ -26,7 +26,7 @@ import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.core.plugin.plugins
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
-import io.element.android.x.anvilannotations.ContributesNode
+import io.element.android.anvilannotations.ContributesNode
 import io.element.android.libraries.architecture.presenterConnector
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.core.RoomId
diff --git a/features/template/src/main/kotlin/io/element/android/features/template/TemplateNode.kt b/features/template/src/main/kotlin/io/element/android/features/template/TemplateNode.kt
index 4d907023c8..6e08d6887d 100644
--- a/features/template/src/main/kotlin/io/element/android/features/template/TemplateNode.kt
+++ b/features/template/src/main/kotlin/io/element/android/features/template/TemplateNode.kt
@@ -26,7 +26,7 @@ import com.bumble.appyx.core.plugin.Plugin
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.libraries.architecture.presenterConnector
-import io.element.android.x.anvilannotations.ContributesNode
+import io.element.android.anvilannotations.ContributesNode
 import io.element.android.libraries.di.AppScope
 
 // TODO Change to use the right Scope for your feature. For now it can be AppScope, SessionScope or RoomScope
diff --git a/libraries/elementresources/build.gradle.kts b/libraries/elementresources/build.gradle.kts
index 3202b47a8d..b61593b700 100644
--- a/libraries/elementresources/build.gradle.kts
+++ b/libraries/elementresources/build.gradle.kts
@@ -19,7 +19,7 @@ plugins {
 }
 
 android {
-    namespace = "io.element.android.x.element.resources"
+    namespace = "io.element.android.element.resources"
 }
 
 dependencies {
diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt
index f58e0634eb..86c1084f5d 100644
--- a/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt
+++ b/libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt
@@ -50,7 +50,7 @@ import io.element.android.libraries.textcomposer.databinding.ViewRichTextMenuBut
 import io.element.android.libraries.textcomposer.tools.setTextIfDifferent
 import uniffi.wysiwyg_composer.ActionState
 import uniffi.wysiwyg_composer.ComposerAction
-import io.element.android.x.element.resources.R as ElementR
+import io.element.android.element.resources.R as ElementR
 import io.element.android.libraries.ui.strings.R as StringR
 
 // Imported from Element Android