From 504009499fb12d33ea9207da0fab37d1025e79aa Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit.marty@gmail.com>
Date: Tue, 2 Jul 2019 17:27:08 +0200
Subject: [PATCH] Rename im.vector.riotredesign to im.vector.riotx

---
 .../check/forbidden_strings_in_resources.txt  |  4 +-
 tools/debug_alter_scalar_token.sh             |  2 +-
 tools/debug_dump_filesystem.sh                |  2 +-
 tools/debug_dump_prefs.sh                     |  2 +-
 tools/tests/app_standby_off.sh                |  4 +-
 tools/tests/app_standby_on.sh                 |  4 +-
 vector/build.gradle                           |  2 +-
 .../ExampleInstrumentedTest.kt                |  4 +-
 vector/src/debug/AndroidManifest.xml          |  9 +-
 .../debug/DebugMaterialThemeActivity.kt       |  6 +-
 .../debug/DebugMaterialThemeDarkActivity.kt   |  2 +-
 .../debug/DebugMaterialThemeLightActivity.kt  |  2 +-
 .../features/debug/DebugMenuActivity.kt       |  6 +-
 .../features/debug/TestLinkifyActivity.kt     |  4 +-
 .../receivers/DebugReceiver.kt                |  4 +-
 .../debug/res/layout/activity_debug_menu.xml  |  2 +-
 .../res/layout/activity_test_linkify.xml      |  2 +-
 vector/src/fdroid/AndroidManifest.xml         |  6 +-
 .../troubleshoot/TestAutoStartBoot.kt         | 10 +-
 .../TestBackgroundRestrictions.kt             |  8 +-
 .../troubleshoot/TestBatteryOptimization.kt   | 12 +--
 .../fdroid/package-info.kt                    |  2 +-
 .../receiver/AlarmSyncBroadcastReceiver.kt    |  4 +-
 .../OnApplicationUpgradeOrRebootReceiver.kt   |  4 +-
 .../fdroid/service/VectorSyncService.kt       |  7 +-
 .../push/fcm/FcmHelper.kt                     | 10 +-
 ...ificationTroubleshootTestManagerFactory.kt |  8 +-
 vector/src/gplay/AndroidManifest.xml          |  2 +-
 vector/src/gplay/google-services.json         | 91 +-----------------
 .../troubleshoot/TestFirebaseToken.kt         | 14 +--
 .../settings/troubleshoot/TestPlayServices.kt |  8 +-
 .../troubleshoot/TestTokenRegistration.kt     | 14 +--
 .../gplay/package-info.kt                     |  2 +-
 .../fcm/VectorFirebaseMessagingService.kt     | 29 +++---
 .../push/fcm/FcmHelper.kt                     |  8 +-
 ...ificationTroubleshootTestManagerFactory.kt | 18 ++--
 vector/src/main/AndroidManifest.xml           |  8 +-
 .../EmojiCompatFontProvider.kt                |  2 +-
 .../VectorApplication.kt                      | 32 +++----
 .../core/animations/Constants.kt              |  2 +-
 .../core/animations/SimpleAnimatorListener.kt |  2 +-
 .../animations/SimpleTransitionListener.kt    |  2 +-
 .../animations/VectorFullTransitionSet.kt     |  2 +-
 .../core/di/ActiveSessionHolder.kt            |  3 +-
 .../core/di/HasScreenInjector.kt              |  2 +-
 .../core/di/HasVectorInjector.kt              |  2 +-
 .../core/di/ScreenComponent.kt                | 72 +++++++--------
 .../core/di/ScreenModule.kt                   |  4 +-
 .../core/di/ScreenScope.java                  |  2 +-
 .../core/di/VectorAssistedModule.kt           |  2 +-
 .../core/di/VectorComponent.kt                | 36 ++++----
 .../core/di/VectorModule.kt                   |  6 +-
 .../core/di/VectorViewModelFactory.kt         |  2 +-
 .../core/di/ViewModelKey.kt                   |  2 +-
 .../core/di/ViewModelModule.kt                | 68 +++++++-------
 .../core/dialogs/DialogAdapter.kt             |  4 +-
 .../core/dialogs/DialogCallAdapter.kt         |  4 +-
 .../core/dialogs/DialogListItem.kt            |  4 +-
 .../core/dialogs/DialogListItemHolder.kt      |  4 +-
 .../core/dialogs/DialogLocker.kt              |  4 +-
 .../core/dialogs/DialogSendItemAdapter.kt     |  4 +-
 .../core/dialogs/ExportKeysDialog.kt          |  8 +-
 .../core/epoxy/EmptyItem.kt                   |  4 +-
 .../core/epoxy/ErrorWithRetryItem.kt          |  4 +-
 .../core/epoxy/LayoutManagerStateRestorer.kt  |  6 +-
 .../core/epoxy/LoadingItem.kt                 |  6 +-
 .../core/epoxy/NoResultItem.kt                |  4 +-
 .../core/epoxy/VectorEpoxyHolder.kt           |  2 +-
 .../core/epoxy/VectorEpoxyModel.kt            |  2 +-
 .../core/error/ErrorFormatter.kt              |  6 +-
 .../core/extensions/Activity.kt               |  2 +-
 .../core/extensions/BasicExtensions.kt        |  2 +-
 .../core/extensions/Context.kt                |  6 +-
 .../core/extensions/EditText.kt               |  4 +-
 .../core/extensions/Event.kt                  |  4 +-
 .../core/extensions/Fragment.kt               |  2 +-
 .../core/extensions/FragmentManager.kt        |  2 +-
 .../core/extensions/Iterable.kt               |  2 +-
 .../core/extensions/LiveData.kt               |  8 +-
 .../core/extensions/Session.kt                |  4 +-
 .../core/extensions/TextView.kt               |  4 +-
 .../core/extensions/UrlExtensions.kt          |  2 +-
 .../core/extensions/View.kt                   |  2 +-
 .../core/extensions/ViewExtensions.kt         |  4 +-
 .../core/files/FileSaver.kt                   |  2 +-
 .../core/glide/ElementToDecryptOption.kt      |  2 +-
 .../core/glide/MyAppGlideModule.kt            |  6 +-
 .../core/glide/VectorGlideModelLoader.kt      |  6 +-
 .../core/intent/ExternalIntentAnalyser.kt     |  2 +-
 .../core/intent/Filename.kt                   |  2 +-
 .../core/intent/VectorMimeType.kt             |  4 +-
 .../core/linkify/VectorAutoLinkPatterns.kt    |  2 +-
 .../core/linkify/VectorLinkify.kt             |  2 +-
 .../core/mvrx/NavigationViewModel.kt          |  4 +-
 .../core/platform/ButtonStateView.kt          |  4 +-
 .../platform/CheckableConstraintLayout.kt     |  2 +-
 .../core/platform/CheckableFrameLayout.kt     |  2 +-
 .../core/platform/CheckableView.kt            |  2 +-
 .../core/platform/ConfigurationViewModel.kt   |  6 +-
 .../platform/DefaultListUpdateCallback.kt     |  2 +-
 .../core/platform/OnBackPressed.kt            |  2 +-
 .../core/platform/Restorable.kt               |  2 +-
 .../core/platform/SimpleFragmentActivity.kt   |  9 +-
 .../core/platform/SimpleTextWatcher.kt        |  2 +-
 .../core/platform/StateView.kt                |  4 +-
 .../core/platform/ToolbarConfigurable.kt      |  2 +-
 .../core/platform/VectorBaseActivity.kt       | 24 ++---
 .../core/platform/VectorBaseFragment.kt       | 10 +-
 .../core/platform/VectorPreferenceFragment.kt |  6 +-
 .../core/platform/VectorViewModel.kt          |  4 +-
 .../core/platform/WaitingViewData.kt          |  2 +-
 .../core/preference/AddressPreference.kt      |  4 +-
 .../core/preference/BingRulePreference.kt     |  4 +-
 .../core/preference/ProgressBarPreference.kt  |  4 +-
 .../core/preference/RoomAvatarPreference.kt   |  2 +-
 .../core/preference/UserAvatarPreference.kt   |  8 +-
 .../preference/VectorEditTextPreference.kt    |  4 +-
 .../core/preference/VectorGroupPreference.kt  |  4 +-
 .../core/preference/VectorListPreference.kt   |  4 +-
 .../core/preference/VectorPreference.kt       |  6 +-
 .../preference/VectorPreferenceCategory.kt    |  2 +-
 .../preference/VectorPreferenceDivider.kt     |  4 +-
 .../core/preference/VectorSwitchPreference.kt |  2 +-
 .../core/pushers/PushersManager.kt            | 12 +--
 .../core/resources/AppNameProvider.kt         |  2 +-
 .../core/resources/ColorProvider.kt           |  4 +-
 .../core/resources/DateProvider.kt            |  2 +-
 .../core/resources/LocaleProvider.kt          |  2 +-
 .../core/resources/ResourceUtils.kt           |  4 +-
 .../core/resources/StringArrayProvider.kt     |  2 +-
 .../core/resources/StringProvider.kt          |  2 +-
 .../core/resources/UserPreferencesProvider.kt |  4 +-
 .../core/services/CallService.kt              | 10 +-
 .../core/services/VectorService.kt            |  2 +-
 .../core/ui/list/GenericFooterItem.kt         | 10 +-
 .../core/ui/list/GenericItem.kt               | 10 +-
 .../core/ui/views/KeysBackupBanner.kt         |  4 +-
 .../core/ui/views/PasswordStrengthBar.kt      |  4 +-
 .../core/utils/DebouncedClickListener.kt      |  2 +-
 .../core/utils/Debouncer.kt                   |  2 +-
 .../core/utils/Dialogs.kt                     |  2 +-
 .../core/utils/DimensionUtils.kt              |  2 +-
 .../core/utils/Emoji.kt                       |  6 +-
 .../core/utils/ExternalApplicationsUtil.kt    |  6 +-
 .../core/utils/FileUtils.kt                   |  2 +-
 .../core/utils/LiveEvent.kt                   |  2 +-
 .../core/utils/PermissionsTools.kt            |  4 +-
 .../core/utils/RingtoneUtils.kt               |  4 +-
 .../core/utils/RxStore.kt                     |  2 +-
 .../core/utils/SystemUtils.kt                 |  8 +-
 .../core/utils/TextUtils.kt                   |  2 +-
 .../features/MainActivity.kt                  | 12 +--
 .../autocomplete/AutocompleteClickListener.kt |  2 +-
 .../EpoxyAutocompletePresenter.kt             |  2 +-
 .../command/AutocompleteCommandController.kt  |  8 +-
 .../command/AutocompleteCommandItem.kt        |  8 +-
 .../command/AutocompleteCommandPresenter.kt   |  6 +-
 .../command/CommandAutocompletePolicy.kt      |  2 +-
 .../user/AutocompleteUserController.kt        |  6 +-
 .../autocomplete/user/AutocompleteUserItem.kt | 10 +-
 .../user/AutocompleteUserPresenter.kt         |  4 +-
 .../features/badge/BadgeProxy.kt              |  2 +-
 .../features/command/Command.kt               |  4 +-
 .../features/command/CommandParser.kt         |  2 +-
 .../features/command/ParsedCommand.kt         |  2 +-
 .../configuration/VectorConfiguration.kt      |  8 +-
 .../features/crypto/keys/KeysExporter.kt      |  6 +-
 .../features/crypto/keys/KeysImporter.kt      |  6 +-
 .../restore/KeysBackupRestoreActivity.kt      |  8 +-
 .../KeysBackupRestoreFromKeyFragment.kt       | 10 +-
 .../KeysBackupRestoreFromKeyViewModel.kt      |  8 +-
 ...KeysBackupRestoreFromPassphraseFragment.kt | 12 +--
 ...eysBackupRestoreFromPassphraseViewModel.kt |  8 +-
 .../KeysBackupRestoreSharedViewModel.kt       |  8 +-
 .../KeysBackupRestoreSuccessFragment.kt       | 10 +-
 .../settings/KeysBackupManageActivity.kt      | 11 +--
 .../settings/KeysBackupSettingFooterItem.kt   | 10 +-
 .../settings/KeysBackupSettingViewState.kt    |  2 +-
 .../settings/KeysBackupSettingsFragment.kt    | 12 +--
 ...eysBackupSettingsRecyclerViewController.kt | 14 +--
 .../settings/KeysBackupSettingsViewModel.kt   |  4 +-
 .../setup/KeysBackupSetupActivity.kt          | 14 +--
 .../setup/KeysBackupSetupSharedViewModel.kt   |  8 +-
 .../setup/KeysBackupSetupStep1Fragment.kt     | 10 +-
 .../setup/KeysBackupSetupStep2Fragment.kt     | 14 +--
 .../setup/KeysBackupSetupStep3Fragment.kt     | 14 +--
 .../crypto/keysrequest/KeyRequestHandler.kt   |  8 +-
 .../IncomingVerificationRequestHandler.kt     | 10 +-
 .../verification/SASVerificationActivity.kt   | 10 +-
 .../SASVerificationIncomingFragment.kt        | 10 +-
 .../SASVerificationShortCodeFragment.kt       |  6 +-
 .../SASVerificationStartFragment.kt           |  8 +-
 .../SASVerificationVerifiedFragment.kt        |  6 +-
 .../verification/SasVerificationViewModel.kt  |  4 +-
 .../features/disclaimer/DisclaimerDialog.kt   | 10 +-
 .../features/form/FormEditTextItem.kt         | 10 +-
 .../features/form/FormSwitchItem.kt           | 10 +-
 .../features/home/AvatarRenderer.kt           | 12 +--
 .../features/home/HomeActivity.kt             | 36 ++++----
 .../features/home/HomeActivityViewModel.kt    |  8 +-
 .../features/home/HomeDetailFragment.kt       | 20 ++--
 .../features/home/HomeDetailViewModel.kt      |  4 +-
 .../features/home/HomeDetailViewState.kt      |  2 +-
 .../features/home/HomeDrawerFragment.kt       | 14 +--
 .../features/home/HomeModule.kt               |  6 +-
 .../features/home/HomeNavigationViewModel.kt  |  4 +-
 .../features/home/HomeNavigator.kt            |  6 +-
 .../home/HomeRoomListObservableStore.kt       |  8 +-
 .../features/home/LoadingFragment.kt          |  6 +-
 .../features/home/PermalinkHandler.kt         |  4 +-
 .../features/home/UserColor.kt                |  4 +-
 .../features/home/group/GroupListActions.kt   |  2 +-
 .../features/home/group/GroupListFragment.kt  | 15 ++-
 .../features/home/group/GroupListViewModel.kt | 10 +-
 .../features/home/group/GroupListViewState.kt |  2 +-
 .../home/group/GroupSummaryController.kt      |  4 +-
 .../features/home/group/GroupSummaryItem.kt   | 12 +--
 .../features/home/group/SelectedGroupStore.kt |  4 +-
 .../features/home/room/VisibleRoomStore.kt    |  4 +-
 .../home/room/detail/RoomDetailActions.kt     |  2 +-
 .../home/room/detail/RoomDetailActivity.kt    | 10 +-
 .../home/room/detail/RoomDetailFragment.kt    | 92 +++++++++----------
 .../home/room/detail/RoomDetailViewModel.kt   | 18 ++--
 .../home/room/detail/RoomDetailViewState.kt   |  2 +-
 .../ScrollOnHighlightedEventCallback.kt       |  6 +-
 .../room/detail/ScrollOnNewMessageCallback.kt |  4 +-
 .../home/room/detail/SendMessageResult.kt     |  4 +-
 .../detail/composer/TextComposerActions.kt    |  2 +-
 .../room/detail/composer/TextComposerView.kt  |  4 +-
 .../detail/composer/TextComposerViewModel.kt  |  6 +-
 .../detail/composer/TextComposerViewState.kt  |  4 +-
 .../timeline/TimelineEventController.kt       | 26 +++---
 .../TimelineEventControllerHandler.kt         |  2 +-
 .../detail/timeline/action/ActionsHandler.kt  |  4 +-
 .../action/MessageActionsBottomSheet.kt       | 10 +-
 .../action/MessageActionsViewModel.kt         | 10 +-
 .../timeline/action/MessageMenuFragment.kt    | 10 +-
 .../timeline/action/MessageMenuViewModel.kt   | 12 +--
 .../timeline/action/QuickReactionFragment.kt  | 10 +-
 .../timeline/action/QuickReactionViewModel.kt |  6 +-
 .../timeline/action/ReactionInfoSimpleItem.kt |  6 +-
 .../action/TimelineEventFragmentArgs.kt       |  4 +-
 .../VectorBaseBottomSheetDialogFragment.kt    |  8 +-
 .../action/ViewReactionBottomSheet.kt         | 10 +-
 .../timeline/action/ViewReactionViewModel.kt  | 10 +-
 .../action/ViewReactionsEpoxyController.kt    |  2 +-
 .../animation/TimelineItemAnimator.kt         |  2 +-
 .../timeline/factory/DefaultItemFactory.kt    |  6 +-
 .../timeline/factory/EncryptedItemFactory.kt  | 22 ++---
 .../timeline/factory/EncryptionItemFactory.kt | 20 ++--
 .../timeline/factory/MessageItemFactory.kt    | 34 +++----
 .../timeline/factory/NoticeItemFactory.kt     | 18 ++--
 .../timeline/factory/TimelineItemFactory.kt   | 16 ++--
 .../timeline/format/NoticeEventFormatter.kt   |  8 +-
 .../helper/ContentUploadStateTrackerBinder.kt |  8 +-
 .../EndlessRecyclerViewScrollListener.kt      |  2 +-
 .../timeline/helper/TimelineAsyncHelper.kt    |  2 +-
 .../timeline/helper/TimelineDateFormatter.kt  |  4 +-
 .../helper/TimelineDisplayableEvents.kt       |  4 +-
 .../helper/TimelineEventDiffUtilCallback.kt   |  2 +-
 ...lineEventVisibilityStateChangedListener.kt |  6 +-
 .../helper/TimelineMediaSizeProvider.kt       |  4 +-
 .../detail/timeline/item/AbsMessageItem.kt    | 14 +--
 .../detail/timeline/item/BaseEventItem.kt     | 12 +--
 .../room/detail/timeline/item/BlankItem.kt    |  8 +-
 .../detail/timeline/item/DaySeparatorItem.kt  |  6 +-
 .../room/detail/timeline/item/DefaultItem.kt  |  4 +-
 .../detail/timeline/item/MergedHeaderItem.kt  |  6 +-
 .../detail/timeline/item/MessageFileItem.kt   |  6 +-
 .../timeline/item/MessageImageVideoItem.kt    | 10 +-
 .../timeline/item/MessageInformationData.kt   |  2 +-
 .../detail/timeline/item/MessageTextItem.kt   | 12 +--
 .../room/detail/timeline/item/NoticeItem.kt   |  8 +-
 .../timeline/item/RedactedMessageItem.kt      |  6 +-
 .../util/MessageInformationDataFactory.kt     | 16 ++--
 .../room/list/AlphabeticalRoomComparator.kt   |  2 +-
 .../room/list/ChronologicalRoomComparator.kt  |  2 +-
 .../home/room/list/RoomCategoryItem.kt        | 10 +-
 .../home/room/list/RoomInvitationItem.kt      | 14 +--
 .../home/room/list/RoomListActions.kt         |  2 +-
 .../home/room/list/RoomListAnimator.kt        |  2 +-
 .../room/list/RoomListDisplayModeFilter.kt    |  2 +-
 .../home/room/list/RoomListFragment.kt        | 22 ++---
 .../home/room/list/RoomListViewModel.kt       |  8 +-
 .../home/room/list/RoomListViewState.kt       |  4 +-
 .../home/room/list/RoomSummaryController.kt   |  4 +-
 .../home/room/list/RoomSummaryFormatter.kt    |  2 +-
 .../home/room/list/RoomSummaryItem.kt         | 10 +-
 .../home/room/list/RoomSummaryItemFactory.kt  | 22 ++---
 .../home/room/list/UnreadCounterBadgeView.kt  |  6 +-
 .../home/room/list/widget/FabMenuView.kt      |  6 +-
 .../homeserver/ServerUrlsRepository.kt        |  4 +-
 .../features/html/EventHtmlRenderer.kt        |  8 +-
 .../features/html/FontTagHandler.kt           |  2 +-
 .../features/html/PillImageSpan.kt            |  8 +-
 .../features/invite/VectorInviteView.kt       |  8 +-
 .../VectorActivityLifecycleCallbacks.kt       |  4 +-
 .../features/login/LoginActivity.kt           | 20 ++--
 .../media/DefaultImageLoaderCallback.kt       |  2 +-
 .../features/media/ImageContentRenderer.kt    |  8 +-
 .../media/ImageMediaViewerActivity.kt         | 10 +-
 .../features/media/VideoContentRenderer.kt    |  5 +-
 .../media/VideoMediaViewerActivity.kt         |  9 +-
 .../features/navigation/DefaultNavigator.kt   | 24 ++---
 .../features/navigation/Navigator.kt          |  2 +-
 .../features/notifications/BitmapLoader.kt    |  2 +-
 .../features/notifications/IconLoader.kt      |  2 +-
 .../notifications/InviteNotifiableEvent.kt    |  2 +-
 .../features/notifications/NotifiableEvent.kt |  2 +-
 .../notifications/NotifiableEventResolver.kt  | 10 +-
 .../notifications/NotifiableMessageEvent.kt   |  2 +-
 .../notifications/NotificationAction.kt       |  2 +-
 .../NotificationBroadcastReceiver.kt          |  8 +-
 .../NotificationDrawerManager.kt              | 10 +-
 .../notifications/NotificationUtils.kt        | 16 ++--
 .../notifications/OutdatedEventDetector.kt    |  4 +-
 .../notifications/PushRuleTriggerListener.kt  |  2 +-
 .../notifications/RoomEventGroupInfo.kt       |  2 +-
 .../notifications/SimpleNotifiableEvent.kt    |  2 +-
 .../features/popup/PopupAlertManager.kt       |  6 +-
 .../features/rageshake/BugReportActivity.kt   |  8 +-
 .../features/rageshake/BugReporter.kt         | 18 ++--
 .../rageshake/BugReporterMultipartBody.java   |  2 +-
 .../features/rageshake/RageShake.kt           |  4 +-
 .../features/rageshake/VectorFileLogger.kt    |  4 +-
 .../VectorUncaughtExceptionHandler.kt         |  6 +-
 .../reactions/EmojiChooserFragment.kt         |  6 +-
 .../reactions/EmojiChooserViewModel.kt        |  4 +-
 .../features/reactions/EmojiDataSource.kt     |  7 +-
 .../features/reactions/EmojiDrawView.kt       |  2 +-
 .../reactions/EmojiReactionPickerActivity.kt  | 12 +--
 .../reactions/EmojiRecyclerAdapter.kt         |  4 +-
 .../reactions/ReactionClickListener.kt        |  2 +-
 .../features/reactions/widget/CircleView.kt   |  2 +-
 .../features/reactions/widget/DotsView.kt     |  2 +-
 .../reactions/widget/ReactionButton.kt        |  6 +-
 .../features/roomdirectory/JoinState.kt       |  2 +-
 .../features/roomdirectory/PublicRoomItem.kt  | 14 +--
 .../roomdirectory/PublicRoomsController.kt    | 16 ++--
 .../roomdirectory/PublicRoomsFragment.kt      | 14 +--
 .../roomdirectory/PublicRoomsViewState.kt     |  2 +-
 .../roomdirectory/RoomDirectoryActivity.kt    | 18 ++--
 .../RoomDirectoryNavigationViewModel.kt       |  4 +-
 .../roomdirectory/RoomDirectoryViewModel.kt   |  6 +-
 .../createroom/CreateRoomController.kt        | 16 ++--
 .../createroom/CreateRoomFragment.kt          | 12 +--
 .../createroom/CreateRoomViewModel.kt         |  4 +-
 .../createroom/CreateRoomViewState.kt         |  2 +-
 .../roomdirectory/picker/RoomDirectoryItem.kt | 12 +--
 .../picker/RoomDirectoryListCreator.kt        |  6 +-
 .../picker/RoomDirectoryPickerController.kt   | 12 +--
 .../picker/RoomDirectoryPickerFragment.kt     | 14 +--
 .../picker/RoomDirectoryPickerViewModel.kt    |  4 +-
 .../picker/RoomDirectoryPickerViewState.kt    |  2 +-
 .../roompreview/RoomPreviewActivity.kt        | 10 +-
 .../RoomPreviewNoPreviewFragment.kt           | 18 ++--
 .../roompreview/RoomPreviewViewModel.kt       |  6 +-
 .../roompreview/RoomPreviewViewState.kt       |  4 +-
 .../features/settings/FontScale.kt            |  4 +-
 .../features/settings/PreferencesManager.java |  8 +-
 .../features/settings/VectorLocale.kt         |  4 +-
 .../settings/VectorSettingsActivity.kt        |  8 +-
 ...sAdvancedNotificationPreferenceFragment.kt | 20 ++--
 .../settings/VectorSettingsBaseFragment.kt    | 14 +--
 .../settings/VectorSettingsFlairFragment.kt   |  6 +-
 ...ctorSettingsFragmentInteractionListener.kt |  2 +-
 .../settings/VectorSettingsGeneralFragment.kt | 26 +++---
 .../VectorSettingsHelpAboutFragment.kt        | 10 +-
 .../VectorSettingsIgnoredUsersFragment.kt     |  4 +-
 .../settings/VectorSettingsLabsFragment.kt    |  4 +-
 .../VectorSettingsNotificationFragment.kt     | 12 +--
 ...ttingsNotificationsTroubleshootFragment.kt | 20 ++--
 .../VectorSettingsPreferencesFragment.kt      | 10 +-
 .../settings/VectorSettingsRootFragment.kt    |  6 +-
 .../VectorSettingsSecurityPrivacyFragment.kt  | 26 +++---
 .../features/settings/VectorSettingsUrls.kt   |  2 +-
 .../VectorSettingsVoiceVideoFragment.kt       | 12 +--
 .../features/settings/push/PushGatewayItem.kt |  6 +-
 .../settings/push/PushGatewaysFragment.kt     | 12 +--
 .../settings/push/PushGatewaysViewModel.kt    |  4 +-
 .../features/settings/push/PushRuleItem.kt    |  8 +-
 .../settings/push/PushRulesFragment.kt        | 12 +--
 .../settings/push/PushRulesViewModel.kt       |  6 +-
 ...ficationTroubleshootRecyclerViewAdapter.kt |  6 +-
 .../NotificationTroubleshootTestManager.kt    |  2 +-
 .../troubleshoot/TestAccountSettings.kt       |  8 +-
 .../troubleshoot/TestBingRulesSettings.kt     | 10 +-
 .../troubleshoot/TestDeviceSettings.kt        |  8 +-
 .../troubleshoot/TestSystemSettings.kt        |  8 +-
 .../settings/troubleshoot/TroubleshootTest.kt |  2 +-
 .../features/themes/ActivityOtherThemes.kt    |  4 +-
 .../features/themes/ThemeUtils.kt             |  4 +-
 .../features/version/Version.kt               |  4 +-
 .../SignOutBottomSheetDialogFragment.kt       | 14 +--
 .../workers/signout/SignOutUiWorker.kt        | 12 +--
 .../workers/signout/SignOutViewModel.kt       |  2 +-
 .../layout/activity_emoji_reaction_picker.xml |  4 +-
 .../res/layout/emoji_chooser_fragment.xml     |  2 +-
 .../main/res/layout/fragment_group_list.xml   |  4 +-
 .../main/res/layout/fragment_home_detail.xml  |  2 +-
 .../fragment_keys_backup_setup_step2.xml      |  2 +-
 .../main/res/layout/fragment_room_detail.xml  |  4 +-
 .../main/res/layout/fragment_room_list.xml    |  6 +-
 .../fragment_room_preview_no_preview.xml      |  2 +-
 .../src/main/res/layout/grid_item_emoji.xml   |  2 +-
 vector/src/main/res/layout/item_group.xml     |  4 +-
 .../src/main/res/layout/item_public_room.xml  |  2 +-
 vector/src/main/res/layout/item_room.xml      |  2 +-
 .../main/res/layout/item_room_category.xml    |  2 +-
 .../main/res/layout/item_room_invitation.xml  |  4 +-
 .../res/layout/item_timeline_event_base.xml   |  2 +-
 .../item_timeline_event_base_noinfo.xml       |  2 +-
 ...m_timeline_event_bottom_reactions_stub.xml | 16 ++--
 .../src/main/res/layout/reaction_button.xml   |  4 +-
 .../vector_home_badge_unread_layout.xml       |  2 +-
 .../main/res/xml/vector_settings_flair.xml    |  2 +-
 .../main/res/xml/vector_settings_general.xml  | 54 +++++------
 .../res/xml/vector_settings_help_about.xml    | 22 ++---
 .../res/xml/vector_settings_ignored_users.xml |  4 +-
 .../src/main/res/xml/vector_settings_labs.xml | 18 ++--
 ...ings_notification_advanced_preferences.xml | 28 +++---
 .../res/xml/vector_settings_notifications.xml | 46 +++++-----
 .../res/xml/vector_settings_preferences.xml   | 60 ++++++------
 .../src/main/res/xml/vector_settings_root.xml | 36 ++++----
 .../xml/vector_settings_security_privacy.xml  | 38 ++++----
 .../res/xml/vector_settings_voice_video.xml   |  8 +-
 .../features/debug/DebugMenuActivity.kt       |  2 +-
 .../receivers/DebugReceiver.kt                |  2 +-
 .../ExampleUnitTest.kt                        |  2 +-
 429 files changed, 1633 insertions(+), 1742 deletions(-)
 rename vector/src/androidTest/java/im/vector/{riotredesign => riotx}/ExampleInstrumentedTest.kt (91%)
 rename vector/src/debug/java/im/vector/{riotredesign => riotx}/features/debug/DebugMaterialThemeActivity.kt (94%)
 rename vector/src/debug/java/im/vector/{riotredesign => riotx}/features/debug/DebugMaterialThemeDarkActivity.kt (93%)
 rename vector/src/debug/java/im/vector/{riotredesign => riotx}/features/debug/DebugMaterialThemeLightActivity.kt (92%)
 rename vector/src/debug/java/im/vector/{riotredesign => riotx}/features/debug/DebugMenuActivity.kt (97%)
 rename vector/src/debug/java/im/vector/{riotredesign => riotx}/features/debug/TestLinkifyActivity.kt (98%)
 rename vector/src/debug/java/im/vector/{riotredesign => riotx}/receivers/DebugReceiver.kt (96%)
 rename vector/src/fdroid/java/im/vector/{riotredesign => riotx}/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt (84%)
 rename vector/src/fdroid/java/im/vector/{riotredesign => riotx}/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt (93%)
 rename vector/src/fdroid/java/im/vector/{riotredesign => riotx}/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt (79%)
 rename vector/src/fdroid/java/im/vector/{riotredesign => riotx}/fdroid/package-info.kt (94%)
 rename vector/src/fdroid/java/im/vector/{riotredesign => riotx}/fdroid/receiver/AlarmSyncBroadcastReceiver.kt (96%)
 rename vector/src/fdroid/java/im/vector/{riotredesign => riotx}/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt (92%)
 rename vector/src/fdroid/java/im/vector/{riotredesign => riotx}/fdroid/service/VectorSyncService.kt (91%)
 rename vector/src/fdroid/java/im/vector/{riotredesign => riotx}/push/fcm/FcmHelper.kt (87%)
 rename vector/src/fdroid/java/im/vector/{riotredesign => riotx}/push/fcm/NotificationTroubleshootTestManagerFactory.kt (86%)
 rename vector/src/gplay/java/im/vector/{riotredesign => riotx}/gplay/features/settings/troubleshoot/TestFirebaseToken.kt (89%)
 rename vector/src/gplay/java/im/vector/{riotredesign => riotx}/gplay/features/settings/troubleshoot/TestPlayServices.kt (90%)
 rename vector/src/gplay/java/im/vector/{riotredesign => riotx}/gplay/features/settings/troubleshoot/TestTokenRegistration.kt (88%)
 rename vector/src/gplay/java/im/vector/{riotredesign => riotx}/gplay/package-info.kt (94%)
 rename vector/src/gplay/java/im/vector/{riotredesign => riotx}/gplay/push/fcm/VectorFirebaseMessagingService.kt (92%)
 rename vector/src/gplay/java/im/vector/{riotredesign => riotx}/push/fcm/FcmHelper.kt (95%)
 rename vector/src/gplay/java/im/vector/{riotredesign => riotx}/push/fcm/NotificationTroubleshootTestManagerFactory.kt (73%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/EmojiCompatFontProvider.kt (98%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/VectorApplication.kt (86%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/animations/Constants.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/animations/SimpleAnimatorListener.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/animations/SimpleTransitionListener.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/animations/VectorFullTransitionSet.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/di/ActiveSessionHolder.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/di/HasScreenInjector.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/di/HasVectorInjector.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/di/ScreenComponent.kt (57%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/di/ScreenModule.kt (90%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/di/ScreenScope.java (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/di/VectorAssistedModule.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/di/VectorComponent.kt (64%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/di/VectorModule.kt (92%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/di/VectorViewModelFactory.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/di/ViewModelKey.kt (89%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/di/ViewModelModule.kt (61%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/dialogs/DialogAdapter.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/dialogs/DialogCallAdapter.kt (83%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/dialogs/DialogListItem.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/dialogs/DialogListItemHolder.kt (92%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/dialogs/DialogLocker.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/dialogs/DialogSendItemAdapter.kt (83%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/dialogs/ExportKeysDialog.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/epoxy/EmptyItem.kt (91%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/epoxy/ErrorWithRetryItem.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/epoxy/LayoutManagerStateRestorer.kt (90%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/epoxy/LoadingItem.kt (89%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/epoxy/NoResultItem.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/epoxy/VectorEpoxyHolder.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/epoxy/VectorEpoxyModel.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/error/ErrorFormatter.kt (89%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/extensions/Activity.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/extensions/BasicExtensions.kt (90%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/extensions/Context.kt (85%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/extensions/EditText.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/extensions/Event.kt (88%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/extensions/Fragment.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/extensions/FragmentManager.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/extensions/Iterable.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/extensions/LiveData.kt (88%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/extensions/Session.kt (90%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/extensions/TextView.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/extensions/UrlExtensions.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/extensions/View.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/extensions/ViewExtensions.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/files/FileSaver.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/glide/ElementToDecryptOption.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/glide/MyAppGlideModule.kt (88%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/glide/VectorGlideModelLoader.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/intent/ExternalIntentAnalyser.kt (99%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/intent/Filename.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/intent/VectorMimeType.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/linkify/VectorAutoLinkPatterns.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/linkify/VectorLinkify.kt (99%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/mvrx/NavigationViewModel.kt (91%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/platform/ButtonStateView.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/platform/CheckableConstraintLayout.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/platform/CheckableFrameLayout.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/platform/CheckableView.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/platform/ConfigurationViewModel.kt (91%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/platform/DefaultListUpdateCallback.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/platform/OnBackPressed.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/platform/Restorable.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/platform/SimpleFragmentActivity.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/platform/SimpleTextWatcher.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/platform/StateView.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/platform/ToolbarConfigurable.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/platform/VectorBaseActivity.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/platform/VectorBaseFragment.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/platform/VectorPreferenceFragment.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/platform/VectorViewModel.kt (89%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/platform/WaitingViewData.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/preference/AddressPreference.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/preference/BingRulePreference.kt (99%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/preference/ProgressBarPreference.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/preference/RoomAvatarPreference.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/preference/UserAvatarPreference.kt (92%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/preference/VectorEditTextPreference.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/preference/VectorGroupPreference.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/preference/VectorListPreference.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/preference/VectorPreference.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/preference/VectorPreferenceCategory.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/preference/VectorPreferenceDivider.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/preference/VectorSwitchPreference.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/pushers/PushersManager.kt (86%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/resources/AppNameProvider.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/resources/ColorProvider.kt (92%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/resources/DateProvider.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/resources/LocaleProvider.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/resources/ResourceUtils.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/resources/StringArrayProvider.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/resources/StringProvider.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/resources/UserPreferencesProvider.kt (88%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/services/CallService.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/services/VectorService.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/ui/list/GenericFooterItem.kt (87%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/ui/list/GenericItem.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/ui/views/KeysBackupBanner.kt (99%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/ui/views/PasswordStrengthBar.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/utils/DebouncedClickListener.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/utils/Debouncer.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/utils/Dialogs.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/utils/DimensionUtils.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/utils/Emoji.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/utils/ExternalApplicationsUtil.kt (98%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/utils/FileUtils.kt (98%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/utils/LiveEvent.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/utils/PermissionsTools.kt (99%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/utils/RingtoneUtils.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/utils/RxStore.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/utils/SystemUtils.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/core/utils/TextUtils.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/MainActivity.kt (90%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/autocomplete/AutocompleteClickListener.kt (92%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/autocomplete/EpoxyAutocompletePresenter.kt (98%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/autocomplete/command/AutocompleteCommandController.kt (84%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/autocomplete/command/AutocompleteCommandItem.kt (88%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/autocomplete/command/AutocompleteCommandPresenter.kt (87%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/autocomplete/command/CommandAutocompletePolicy.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/autocomplete/user/AutocompleteUserController.kt (88%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/autocomplete/user/AutocompleteUserItem.kt (85%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/autocomplete/user/AutocompleteUserPresenter.kt (91%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/badge/BadgeProxy.kt (98%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/command/Command.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/command/CommandParser.kt (99%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/command/ParsedCommand.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/configuration/VectorConfiguration.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/keys/KeysExporter.kt (92%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/keys/KeysImporter.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt (92%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt (90%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt (90%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt (85%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt (88%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt (90%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/keysrequest/KeyRequestHandler.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/verification/IncomingVerificationRequestHandler.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/verification/SASVerificationActivity.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/verification/SASVerificationIncomingFragment.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/verification/SASVerificationShortCodeFragment.kt (98%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/verification/SASVerificationStartFragment.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/verification/SASVerificationVerifiedFragment.kt (90%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/crypto/verification/SasVerificationViewModel.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/disclaimer/DisclaimerDialog.kt (90%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/form/FormEditTextItem.kt (89%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/form/FormSwitchItem.kt (88%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/AvatarRenderer.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/HomeActivity.kt (86%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/HomeActivityViewModel.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/HomeDetailFragment.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/HomeDetailViewModel.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/HomeDetailViewState.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/HomeDrawerFragment.kt (85%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/HomeModule.kt (79%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/HomeNavigationViewModel.kt (83%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/HomeNavigator.kt (91%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/HomeRoomListObservableStore.kt (82%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/LoadingFragment.kt (90%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/PermalinkHandler.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/UserColor.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/group/GroupListActions.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/group/GroupListFragment.kt (86%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/group/GroupListViewModel.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/group/GroupListViewState.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/group/GroupSummaryController.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/group/GroupSummaryItem.kt (84%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/group/SelectedGroupStore.kt (89%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/VisibleRoomStore.kt (86%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/RoomDetailActions.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/RoomDetailActivity.kt (86%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/RoomDetailFragment.kt (91%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/RoomDetailViewModel.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/RoomDetailViewState.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/ScrollOnHighlightedEventCallback.kt (89%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/ScrollOnNewMessageCallback.kt (88%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/SendMessageResult.kt (90%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/composer/TextComposerActions.kt (91%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/composer/TextComposerView.kt (98%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/composer/TextComposerViewModel.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/composer/TextComposerViewState.kt (87%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/TimelineEventController.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/TimelineEventControllerHandler.kt (91%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/action/ActionsHandler.kt (90%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/action/MessageActionsViewModel.kt (92%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/action/MessageMenuFragment.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/action/MessageMenuViewModel.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/action/QuickReactionFragment.kt (91%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/action/QuickReactionViewModel.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/action/ReactionInfoSimpleItem.kt (92%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt (82%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/action/VectorBaseBottomSheetDialogFragment.kt (91%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/action/ViewReactionBottomSheet.kt (91%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/action/ViewReactionViewModel.kt (92%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/action/ViewReactionsEpoxyController.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt (92%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/factory/DefaultItemFactory.kt (83%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt (82%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt (76%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/factory/MessageItemFactory.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/factory/NoticeItemFactory.kt (69%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/factory/TimelineItemFactory.kt (87%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/format/NoticeEventFormatter.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/helper/EndlessRecyclerViewScrollListener.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/helper/TimelineDateFormatter.kt (90%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/helper/TimelineEventVisibilityStateChangedListener.kt (88%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt (92%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/item/AbsMessageItem.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/item/BaseEventItem.kt (86%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/item/BlankItem.kt (78%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/item/DaySeparatorItem.kt (87%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/item/DefaultItem.kt (92%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/item/MergedHeaderItem.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/item/MessageFileItem.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/item/MessageImageVideoItem.kt (89%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/item/MessageInformationData.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/item/MessageTextItem.kt (90%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/item/NoticeItem.kt (89%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/item/RedactedMessageItem.kt (88%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/detail/timeline/util/MessageInformationDataFactory.kt (84%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/list/AlphabeticalRoomComparator.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/list/ChronologicalRoomComparator.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/list/RoomCategoryItem.kt (89%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/list/RoomInvitationItem.kt (91%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/list/RoomListActions.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/list/RoomListAnimator.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/list/RoomListDisplayModeFilter.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/list/RoomListFragment.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/list/RoomListViewModel.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/list/RoomListViewState.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/list/RoomSummaryController.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/list/RoomSummaryFormatter.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/list/RoomSummaryItem.kt (89%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/list/RoomSummaryItemFactory.kt (89%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/list/UnreadCounterBadgeView.kt (91%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/home/room/list/widget/FabMenuView.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/homeserver/ServerUrlsRepository.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/html/EventHtmlRenderer.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/html/FontTagHandler.kt (98%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/html/PillImageSpan.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/invite/VectorInviteView.kt (92%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/lifecycle/VectorActivityLifecycleCallbacks.kt (92%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/login/LoginActivity.kt (90%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/media/DefaultImageLoaderCallback.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/media/ImageContentRenderer.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/media/ImageMediaViewerActivity.kt (91%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/media/VideoContentRenderer.kt (90%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/media/VideoMediaViewerActivity.kt (87%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/navigation/DefaultNavigator.kt (76%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/navigation/Navigator.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/notifications/BitmapLoader.kt (98%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/notifications/IconLoader.kt (98%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/notifications/InviteNotifiableEvent.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/notifications/NotifiableEvent.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/notifications/NotifiableEventResolver.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/notifications/NotifiableMessageEvent.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/notifications/NotificationAction.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/notifications/NotificationBroadcastReceiver.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/notifications/NotificationDrawerManager.kt (98%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/notifications/NotificationUtils.kt (98%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/notifications/OutdatedEventDetector.kt (92%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/notifications/PushRuleTriggerListener.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/notifications/RoomEventGroupInfo.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/notifications/SimpleNotifiableEvent.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/popup/PopupAlertManager.kt (98%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/rageshake/BugReportActivity.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/rageshake/BugReporter.kt (98%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/rageshake/BugReporterMultipartBody.java (99%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/rageshake/RageShake.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/rageshake/VectorFileLogger.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/rageshake/VectorUncaughtExceptionHandler.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/reactions/EmojiChooserFragment.kt (91%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/reactions/EmojiChooserViewModel.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/reactions/EmojiDataSource.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/reactions/EmojiDrawView.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/reactions/EmojiReactionPickerActivity.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/reactions/EmojiRecyclerAdapter.kt (99%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/reactions/ReactionClickListener.kt (92%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/reactions/widget/CircleView.kt (98%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/reactions/widget/DotsView.kt (99%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/reactions/widget/ReactionButton.kt (98%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/roomdirectory/JoinState.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/roomdirectory/PublicRoomItem.kt (89%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/roomdirectory/PublicRoomsController.kt (90%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/roomdirectory/PublicRoomsFragment.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/roomdirectory/PublicRoomsViewState.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/roomdirectory/RoomDirectoryActivity.kt (79%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/roomdirectory/RoomDirectoryNavigationViewModel.kt (80%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/roomdirectory/RoomDirectoryViewModel.kt (98%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/roomdirectory/createroom/CreateRoomController.kt (88%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/roomdirectory/createroom/CreateRoomFragment.kt (90%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/roomdirectory/createroom/CreateRoomViewModel.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/roomdirectory/createroom/CreateRoomViewState.kt (92%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/roomdirectory/picker/RoomDirectoryItem.kt (86%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/roomdirectory/picker/RoomDirectoryListCreator.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/roomdirectory/picker/RoomDirectoryPickerController.kt (90%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt (89%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt (92%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/roomdirectory/roompreview/RoomPreviewActivity.kt (89%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt (88%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/roomdirectory/roompreview/RoomPreviewViewModel.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/roomdirectory/roompreview/RoomPreviewViewState.kt (88%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/FontScale.kt (98%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/PreferencesManager.java (99%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/VectorLocale.kt (98%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/VectorSettingsActivity.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/VectorSettingsBaseFragment.kt (91%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/VectorSettingsFlairFragment.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/VectorSettingsFragmentInteractionListener.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/VectorSettingsGeneralFragment.kt (98%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/VectorSettingsHelpAboutFragment.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/VectorSettingsIgnoredUsersFragment.kt (98%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/VectorSettingsLabsFragment.kt (98%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/VectorSettingsNotificationFragment.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt (91%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/VectorSettingsPreferencesFragment.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/VectorSettingsRootFragment.kt (88%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/VectorSettingsSecurityPrivacyFragment.kt (97%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/VectorSettingsUrls.kt (94%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/VectorSettingsVoiceVideoFragment.kt (91%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/push/PushGatewayItem.kt (92%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/push/PushGatewaysFragment.kt (90%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/push/PushGatewaysViewModel.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/push/PushRuleItem.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/push/PushRulesFragment.kt (89%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/push/PushRulesViewModel.kt (88%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt (96%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt (98%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/troubleshoot/TestAccountSettings.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/troubleshoot/TestBingRulesSettings.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/troubleshoot/TestDeviceSettings.kt (88%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/troubleshoot/TestSystemSettings.kt (89%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/settings/troubleshoot/TroubleshootTest.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/themes/ActivityOtherThemes.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/themes/ThemeUtils.kt (99%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/version/Version.kt (93%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/workers/signout/SignOutBottomSheetDialogFragment.kt (95%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/workers/signout/SignOutUiWorker.kt (86%)
 rename vector/src/main/java/im/vector/{riotredesign => riotx}/features/workers/signout/SignOutViewModel.kt (98%)
 rename vector/src/release/java/im/vector/{riotredesign => riotx}/features/debug/DebugMenuActivity.kt (94%)
 rename vector/src/release/java/im/vector/{riotredesign => riotx}/receivers/DebugReceiver.kt (96%)
 rename vector/src/test/java/im/vector/{riotredesign => riotx}/ExampleUnitTest.kt (96%)

diff --git a/tools/check/forbidden_strings_in_resources.txt b/tools/check/forbidden_strings_in_resources.txt
index 120438efde..435a81e3ba 100644
--- a/tools/check/forbidden_strings_in_resources.txt
+++ b/tools/check/forbidden_strings_in_resources.txt
@@ -73,10 +73,10 @@ layout_constraintLeft_
 ### Use Preference from androidx library (androidx.preference.PreferenceScreen)
 <PreferenceScreen
 
-### Use im.vector.riotredesign.core.preference.VectorSwitchPreference to support multiline of the title
+### Use im.vector.riotx.core.preference.VectorSwitchPreference to support multiline of the title
 <SwitchPreference
 
-### Use im.vector.riotredesign.core.preference.VectorPreference to support multiline of the title
+### Use im.vector.riotx.core.preference.VectorPreference to support multiline of the title
 <Preference\n
 
 ### Will crash on API < 21. Use ?colorAccent instead
diff --git a/tools/debug_alter_scalar_token.sh b/tools/debug_alter_scalar_token.sh
index f8716706bb..dc33c465fa 100755
--- a/tools/debug_alter_scalar_token.sh
+++ b/tools/debug_alter_scalar_token.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-adb shell am broadcast -a im.vector.riotredesign.DEBUG_ACTION_ALTER_SCALAR_TOKEN
+adb shell am broadcast -a im.vector.riotx.DEBUG_ACTION_ALTER_SCALAR_TOKEN
diff --git a/tools/debug_dump_filesystem.sh b/tools/debug_dump_filesystem.sh
index efe1745aea..fe418963bf 100755
--- a/tools/debug_dump_filesystem.sh
+++ b/tools/debug_dump_filesystem.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-adb shell am broadcast -a im.vector.riotredesign.DEBUG_ACTION_DUMP_FILESYSTEM
+adb shell am broadcast -a im.vector.riotx.DEBUG_ACTION_DUMP_FILESYSTEM
diff --git a/tools/debug_dump_prefs.sh b/tools/debug_dump_prefs.sh
index 3b5ecadcda..2b6bc2a201 100755
--- a/tools/debug_dump_prefs.sh
+++ b/tools/debug_dump_prefs.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-adb shell am broadcast -a im.vector.riotredesign.DEBUG_ACTION_DUMP_PREFERENCES
+adb shell am broadcast -a im.vector.riotx.DEBUG_ACTION_DUMP_PREFERENCES
diff --git a/tools/tests/app_standby_off.sh b/tools/tests/app_standby_off.sh
index fc3de6a436..f285456bc5 100755
--- a/tools/tests/app_standby_off.sh
+++ b/tools/tests/app_standby_off.sh
@@ -6,5 +6,5 @@ echo "Standby OFF"
 echo "adb shell dumpsys battery reset"
 adb shell dumpsys battery reset
 
-echo "adb shell am set-inactive im.vector.riotredesign false"
-adb shell am set-inactive im.vector.riotredesign false
+echo "adb shell am set-inactive im.vector.riotx false"
+adb shell am set-inactive im.vector.riotx false
diff --git a/tools/tests/app_standby_on.sh b/tools/tests/app_standby_on.sh
index cdd843338b..c4c690b859 100755
--- a/tools/tests/app_standby_on.sh
+++ b/tools/tests/app_standby_on.sh
@@ -6,5 +6,5 @@ echo "Standby ON"
 echo "adb shell dumpsys battery unplug"
 adb shell dumpsys battery unplug
 
-echo "adb shell am set-inactive im.vector.riotredesign true"
-adb shell am set-inactive im.vector.riotredesign true
+echo "adb shell am set-inactive im.vector.riotx true"
+adb shell am set-inactive im.vector.riotx true
diff --git a/vector/build.gradle b/vector/build.gradle
index 5e17277f7e..bb5be1f8eb 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -57,7 +57,7 @@ def buildNumber = System.getenv("BUILDKITE_BUILD_NUMBER") as Integer ?: 0
 android {
     compileSdkVersion 28
     defaultConfig {
-        applicationId "im.vector.riotredesign"
+        applicationId "im.vector.riotx"
         // Set to API 19 because motionLayout is min API 18.
         // In the future we may consider using an alternative of MotionLayout to support API 16. But for security reason, maybe not.
         minSdkVersion 19
diff --git a/vector/src/androidTest/java/im/vector/riotredesign/ExampleInstrumentedTest.kt b/vector/src/androidTest/java/im/vector/riotx/ExampleInstrumentedTest.kt
similarity index 91%
rename from vector/src/androidTest/java/im/vector/riotredesign/ExampleInstrumentedTest.kt
rename to vector/src/androidTest/java/im/vector/riotx/ExampleInstrumentedTest.kt
index 47f15466ee..afed0c783a 100644
--- a/vector/src/androidTest/java/im/vector/riotredesign/ExampleInstrumentedTest.kt
+++ b/vector/src/androidTest/java/im/vector/riotx/ExampleInstrumentedTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign
+package im.vector.riotx
 
 import androidx.test.InstrumentationRegistry
 import androidx.test.runner.AndroidJUnit4
@@ -35,6 +35,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getTargetContext()
-        assertEquals("im.vector.riotredesign", appContext.packageName)
+        assertEquals("im.vector.riotx", appContext.packageName)
     }
 }
diff --git a/vector/src/debug/AndroidManifest.xml b/vector/src/debug/AndroidManifest.xml
index debb2987ef..0d071e3465 100644
--- a/vector/src/debug/AndroidManifest.xml
+++ b/vector/src/debug/AndroidManifest.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="im.vector.riotx">
 
     <application>
-        <activity android:name="im.vector.riotredesign.features.debug.TestLinkifyActivity" />
+        <activity android:name=".features.debug.TestLinkifyActivity" />
         <activity
-            android:name="im.vector.riotredesign.features.debug.DebugMaterialThemeLightActivity"
+            android:name=".features.debug.DebugMaterialThemeLightActivity"
             android:theme="@style/VectorMaterialThemeDebugLight" />
         <activity
-            android:name="im.vector.riotredesign.features.debug.DebugMaterialThemeDarkActivity"
+            android:name=".features.debug.DebugMaterialThemeDarkActivity"
             android:theme="@style/VectorMaterialThemeDebugDark" />
     </application>
 
diff --git a/vector/src/debug/java/im/vector/riotredesign/features/debug/DebugMaterialThemeActivity.kt b/vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeActivity.kt
similarity index 94%
rename from vector/src/debug/java/im/vector/riotredesign/features/debug/DebugMaterialThemeActivity.kt
rename to vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeActivity.kt
index 475427fe85..ab6b86801a 100644
--- a/vector/src/debug/java/im/vector/riotredesign/features/debug/DebugMaterialThemeActivity.kt
+++ b/vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.debug
+package im.vector.riotx.features.debug
 
 import android.os.Bundle
 import android.view.Menu
@@ -22,8 +22,8 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.snackbar.Snackbar
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.utils.toast
+import im.vector.riotx.R
+import im.vector.riotx.core.utils.toast
 import kotlinx.android.synthetic.debug.activity_test_material_theme.*
 
 // Rendering is not the same with VectorBaseActivity
diff --git a/vector/src/debug/java/im/vector/riotredesign/features/debug/DebugMaterialThemeDarkActivity.kt b/vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeDarkActivity.kt
similarity index 93%
rename from vector/src/debug/java/im/vector/riotredesign/features/debug/DebugMaterialThemeDarkActivity.kt
rename to vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeDarkActivity.kt
index bab2141790..83c3266c00 100644
--- a/vector/src/debug/java/im/vector/riotredesign/features/debug/DebugMaterialThemeDarkActivity.kt
+++ b/vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeDarkActivity.kt
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.debug
+package im.vector.riotx.features.debug
 
 class DebugMaterialThemeDarkActivity : DebugMaterialThemeActivity()
\ No newline at end of file
diff --git a/vector/src/debug/java/im/vector/riotredesign/features/debug/DebugMaterialThemeLightActivity.kt b/vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeLightActivity.kt
similarity index 92%
rename from vector/src/debug/java/im/vector/riotredesign/features/debug/DebugMaterialThemeLightActivity.kt
rename to vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeLightActivity.kt
index 039d7c072a..d7e6fd1f79 100644
--- a/vector/src/debug/java/im/vector/riotredesign/features/debug/DebugMaterialThemeLightActivity.kt
+++ b/vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeLightActivity.kt
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.debug
+package im.vector.riotx.features.debug
 
 class DebugMaterialThemeLightActivity : DebugMaterialThemeActivity()
\ No newline at end of file
diff --git a/vector/src/debug/java/im/vector/riotredesign/features/debug/DebugMenuActivity.kt b/vector/src/debug/java/im/vector/riotx/features/debug/DebugMenuActivity.kt
similarity index 97%
rename from vector/src/debug/java/im/vector/riotredesign/features/debug/DebugMenuActivity.kt
rename to vector/src/debug/java/im/vector/riotx/features/debug/DebugMenuActivity.kt
index add4e2daf4..dc81d56608 100644
--- a/vector/src/debug/java/im/vector/riotredesign/features/debug/DebugMenuActivity.kt
+++ b/vector/src/debug/java/im/vector/riotx/features/debug/DebugMenuActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.debug
+package im.vector.riotx.features.debug
 
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -24,8 +24,8 @@ import android.os.Build
 import androidx.core.app.NotificationCompat
 import androidx.core.app.Person
 import butterknife.OnClick
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.platform.VectorBaseActivity
+import im.vector.riotx.R
+import im.vector.riotx.core.platform.VectorBaseActivity
 
 
 class DebugMenuActivity : VectorBaseActivity() {
diff --git a/vector/src/debug/java/im/vector/riotredesign/features/debug/TestLinkifyActivity.kt b/vector/src/debug/java/im/vector/riotx/features/debug/TestLinkifyActivity.kt
similarity index 98%
rename from vector/src/debug/java/im/vector/riotredesign/features/debug/TestLinkifyActivity.kt
rename to vector/src/debug/java/im/vector/riotx/features/debug/TestLinkifyActivity.kt
index 7e37c31903..b91f5db728 100644
--- a/vector/src/debug/java/im/vector/riotredesign/features/debug/TestLinkifyActivity.kt
+++ b/vector/src/debug/java/im/vector/riotx/features/debug/TestLinkifyActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.debug
+package im.vector.riotx.features.debug
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -25,7 +25,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import butterknife.BindView
 import butterknife.ButterKnife
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 
 class TestLinkifyActivity : AppCompatActivity() {
diff --git a/vector/src/debug/java/im/vector/riotredesign/receivers/DebugReceiver.kt b/vector/src/debug/java/im/vector/riotx/receivers/DebugReceiver.kt
similarity index 96%
rename from vector/src/debug/java/im/vector/riotredesign/receivers/DebugReceiver.kt
rename to vector/src/debug/java/im/vector/riotx/receivers/DebugReceiver.kt
index bdafeedcc6..933ee3fb14 100644
--- a/vector/src/debug/java/im/vector/riotredesign/receivers/DebugReceiver.kt
+++ b/vector/src/debug/java/im/vector/riotx/receivers/DebugReceiver.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.receivers
+package im.vector.riotx.receivers
 
 import android.content.*
 import android.preference.PreferenceManager
 import androidx.core.content.edit
-import im.vector.riotredesign.core.utils.lsFiles
+import im.vector.riotx.core.utils.lsFiles
 import timber.log.Timber
 
 /**
diff --git a/vector/src/debug/res/layout/activity_debug_menu.xml b/vector/src/debug/res/layout/activity_debug_menu.xml
index d1e85019f9..af5362e840 100644
--- a/vector/src/debug/res/layout/activity_debug_menu.xml
+++ b/vector/src/debug/res/layout/activity_debug_menu.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="im.vector.riotredesign.features.debug.DebugMenuActivity"
+    tools:context="im.vector.riotx.features.debug.DebugMenuActivity"
     tools:ignore="HardcodedText">
 
     <ScrollView
diff --git a/vector/src/debug/res/layout/activity_test_linkify.xml b/vector/src/debug/res/layout/activity_test_linkify.xml
index 2ccb2e5fc7..4cabd2d972 100644
--- a/vector/src/debug/res/layout/activity_test_linkify.xml
+++ b/vector/src/debug/res/layout/activity_test_linkify.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/riot_secondary_text_color_status"
-    tools:context="im.vector.riotredesign.features.debug.TestLinkifyActivity">
+    tools:context="im.vector.riotx.features.debug.TestLinkifyActivity">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/vector/src/fdroid/AndroidManifest.xml b/vector/src/fdroid/AndroidManifest.xml
index d5437879dd..1a35caff41 100644
--- a/vector/src/fdroid/AndroidManifest.xml
+++ b/vector/src/fdroid/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="im.vector.riotredesign">
+    package="im.vector.riotx">
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -8,7 +8,7 @@
 
     <application>
 
-        <receiver android:name="im.vector.riotredesign.fdroid.receiver.OnApplicationUpgradeOrRebootReceiver">
+        <receiver android:name=".fdroid.receiver.OnApplicationUpgradeOrRebootReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -16,7 +16,7 @@
         </receiver>
 
         <receiver
-            android:name="im.vector.riotredesign.fdroid.receiver.AlarmSyncBroadcastReceiver"
+            android:name=".fdroid.receiver.AlarmSyncBroadcastReceiver"
             android:enabled="true"
             android:exported="false" />
 
diff --git a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt b/vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
similarity index 84%
rename from vector/src/fdroid/java/im/vector/riotredesign/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
rename to vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
index adc2d00c4b..47e87aa4e0 100644
--- a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
+++ b/vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.fdroid.features.settings.troubleshoot
+package im.vector.riotx.fdroid.features.settings.troubleshoot
 
 import androidx.appcompat.app.AppCompatActivity
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.features.settings.PreferencesManager
-import im.vector.riotredesign.features.settings.troubleshoot.TroubleshootTest
+import im.vector.riotx.R
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.features.settings.PreferencesManager
+import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt b/vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
similarity index 93%
rename from vector/src/fdroid/java/im/vector/riotredesign/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
rename to vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
index c124864a61..ce9066c2d1 100644
--- a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
+++ b/vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.fdroid.features.settings.troubleshoot
+package im.vector.riotx.fdroid.features.settings.troubleshoot
 
 import android.content.Context
 import android.net.ConnectivityManager
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.net.ConnectivityManagerCompat
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.features.settings.troubleshoot.TroubleshootTest
+import im.vector.riotx.R
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
 import javax.inject.Inject
 
 class TestBackgroundRestrictions @Inject constructor(private val context: AppCompatActivity,
diff --git a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt b/vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt
similarity index 79%
rename from vector/src/fdroid/java/im/vector/riotredesign/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt
rename to vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt
index 4cfd762feb..041f392c46 100644
--- a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt
+++ b/vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.fdroid.features.settings.troubleshoot
+package im.vector.riotx.fdroid.features.settings.troubleshoot
 
 import androidx.fragment.app.Fragment
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.utils.isIgnoringBatteryOptimizations
-import im.vector.riotredesign.core.utils.requestDisablingBatteryOptimization
-import im.vector.riotredesign.features.settings.troubleshoot.NotificationTroubleshootTestManager
-import im.vector.riotredesign.features.settings.troubleshoot.TroubleshootTest
+import im.vector.riotx.R
+import im.vector.riotx.core.utils.isIgnoringBatteryOptimizations
+import im.vector.riotx.core.utils.requestDisablingBatteryOptimization
+import im.vector.riotx.features.settings.troubleshoot.NotificationTroubleshootTestManager
+import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
 
 // Not used anymore
 class TestBatteryOptimization(val fragment: Fragment) : TroubleshootTest(R.string.settings_troubleshoot_test_battery_title) {
diff --git a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/package-info.kt b/vector/src/fdroid/java/im/vector/riotx/fdroid/package-info.kt
similarity index 94%
rename from vector/src/fdroid/java/im/vector/riotredesign/fdroid/package-info.kt
rename to vector/src/fdroid/java/im/vector/riotx/fdroid/package-info.kt
index 9873a2802d..7e0e112312 100644
--- a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/package-info.kt
+++ b/vector/src/fdroid/java/im/vector/riotx/fdroid/package-info.kt
@@ -17,4 +17,4 @@
 /**
  * Code exclusively used by the FDroid build and not referenced on the main source code
  */
-package im.vector.riotredesign.fdroid
\ No newline at end of file
+package im.vector.riotx.fdroid
\ No newline at end of file
diff --git a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/receiver/AlarmSyncBroadcastReceiver.kt b/vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/AlarmSyncBroadcastReceiver.kt
similarity index 96%
rename from vector/src/fdroid/java/im/vector/riotredesign/fdroid/receiver/AlarmSyncBroadcastReceiver.kt
rename to vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/AlarmSyncBroadcastReceiver.kt
index 5d335c5451..2c0738c2df 100644
--- a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/receiver/AlarmSyncBroadcastReceiver.kt
+++ b/vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/AlarmSyncBroadcastReceiver.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.fdroid.receiver
+package im.vector.riotx.fdroid.receiver
 
 import android.app.AlarmManager
 import android.app.PendingIntent
@@ -25,7 +25,7 @@ import android.os.Build
 import android.os.PowerManager
 import androidx.core.content.ContextCompat
 import im.vector.matrix.android.internal.session.sync.job.SyncService
-import im.vector.riotredesign.fdroid.service.VectorSyncService
+import im.vector.riotx.fdroid.service.VectorSyncService
 import timber.log.Timber
 
 class AlarmSyncBroadcastReceiver : BroadcastReceiver() {
diff --git a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt b/vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt
similarity index 92%
rename from vector/src/fdroid/java/im/vector/riotredesign/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt
rename to vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt
index ca19d0d2c7..207776b530 100644
--- a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt
+++ b/vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.fdroid.receiver
+package im.vector.riotx.fdroid.receiver
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import im.vector.riotredesign.core.di.HasVectorInjector
+import im.vector.riotx.core.di.HasVectorInjector
 import timber.log.Timber
 
 class OnApplicationUpgradeOrRebootReceiver : BroadcastReceiver() {
diff --git a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/service/VectorSyncService.kt b/vector/src/fdroid/java/im/vector/riotx/fdroid/service/VectorSyncService.kt
similarity index 91%
rename from vector/src/fdroid/java/im/vector/riotredesign/fdroid/service/VectorSyncService.kt
rename to vector/src/fdroid/java/im/vector/riotx/fdroid/service/VectorSyncService.kt
index 0c3b3c5c12..a3f999a001 100644
--- a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/service/VectorSyncService.kt
+++ b/vector/src/fdroid/java/im/vector/riotx/fdroid/service/VectorSyncService.kt
@@ -13,16 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.fdroid.service
+package im.vector.riotx.fdroid.service
 
 import android.app.NotificationManager
 import android.content.Context
 import android.content.Intent
 import android.os.Build
-import android.os.IBinder
 import im.vector.matrix.android.internal.session.sync.job.SyncService
-import im.vector.riotredesign.R
-import im.vector.riotredesign.features.notifications.NotificationUtils
+import im.vector.riotx.R
+import im.vector.riotx.features.notifications.NotificationUtils
 import timber.log.Timber
 
 class VectorSyncService : SyncService() {
diff --git a/vector/src/fdroid/java/im/vector/riotredesign/push/fcm/FcmHelper.kt b/vector/src/fdroid/java/im/vector/riotx/push/fcm/FcmHelper.kt
similarity index 87%
rename from vector/src/fdroid/java/im/vector/riotredesign/push/fcm/FcmHelper.kt
rename to vector/src/fdroid/java/im/vector/riotx/push/fcm/FcmHelper.kt
index fb3c00dec1..5293c59b0d 100755
--- a/vector/src/fdroid/java/im/vector/riotredesign/push/fcm/FcmHelper.kt
+++ b/vector/src/fdroid/java/im/vector/riotx/push/fcm/FcmHelper.kt
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.push.fcm
+package im.vector.riotx.push.fcm
 
 import android.app.Activity
 import android.content.Context
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.core.pushers.PushersManager
-import im.vector.riotredesign.fdroid.receiver.AlarmSyncBroadcastReceiver
-import im.vector.riotredesign.features.settings.PreferencesManager
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.core.pushers.PushersManager
+import im.vector.riotx.fdroid.receiver.AlarmSyncBroadcastReceiver
+import im.vector.riotx.features.settings.PreferencesManager
 import timber.log.Timber
 
 /**
diff --git a/vector/src/fdroid/java/im/vector/riotredesign/push/fcm/NotificationTroubleshootTestManagerFactory.kt b/vector/src/fdroid/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt
similarity index 86%
rename from vector/src/fdroid/java/im/vector/riotredesign/push/fcm/NotificationTroubleshootTestManagerFactory.kt
rename to vector/src/fdroid/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt
index f55d9b8e9c..e90ef5aa7d 100644
--- a/vector/src/fdroid/java/im/vector/riotredesign/push/fcm/NotificationTroubleshootTestManagerFactory.kt
+++ b/vector/src/fdroid/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.push.fcm
+package im.vector.riotx.push.fcm
 
 import androidx.fragment.app.Fragment
-import im.vector.riotredesign.fdroid.features.settings.troubleshoot.TestAutoStartBoot
-import im.vector.riotredesign.fdroid.features.settings.troubleshoot.TestBackgroundRestrictions
-import im.vector.riotredesign.features.settings.troubleshoot.*
+import im.vector.riotx.fdroid.features.settings.troubleshoot.TestAutoStartBoot
+import im.vector.riotx.fdroid.features.settings.troubleshoot.TestBackgroundRestrictions
+import im.vector.riotx.features.settings.troubleshoot.*
 import javax.inject.Inject
 
 class NotificationTroubleshootTestManagerFactory @Inject constructor(private val testSystemSettings: TestSystemSettings,
diff --git a/vector/src/gplay/AndroidManifest.xml b/vector/src/gplay/AndroidManifest.xml
index 8f6a1cef48..db30f21f7a 100755
--- a/vector/src/gplay/AndroidManifest.xml
+++ b/vector/src/gplay/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="im.vector.riotredesign">
+    package="im.vector.riotx">
 
     <application>
 
diff --git a/vector/src/gplay/google-services.json b/vector/src/gplay/google-services.json
index 187c727a24..7ee7277e2a 100644
--- a/vector/src/gplay/google-services.json
+++ b/vector/src/gplay/google-services.json
@@ -8,96 +8,9 @@
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:912726360885:android:448c9b63161abc9c",
+        "mobilesdk_app_id": "1:912726360885:android:4ef8f3a0021e774d",
         "android_client_info": {
-          "package_name": "im.vector.alpha"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "912726360885-e87n3jva9uoj4vbidvijq78ebg02asv2.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAFZX8IhIfgzdOZvxDP_ISO5WYoU7jmQ5c"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "912726360885-rsae0i66rgqt6ivnudu1pv4tksg9i8b2.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:912726360885:android:3120c24f6ef22f2b",
-        "android_client_info": {
-          "package_name": "im.vector.app"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "912726360885-e87n3jva9uoj4vbidvijq78ebg02asv2.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAFZX8IhIfgzdOZvxDP_ISO5WYoU7jmQ5c"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "912726360885-rsae0i66rgqt6ivnudu1pv4tksg9i8b2.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:912726360885:android:25ef253beaff462e",
-        "android_client_info": {
-          "package_name": "im.vector.riotredesign"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "912726360885-e87n3jva9uoj4vbidvijq78ebg02asv2.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAFZX8IhIfgzdOZvxDP_ISO5WYoU7jmQ5c"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "912726360885-rsae0i66rgqt6ivnudu1pv4tksg9i8b2.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:912726360885:android:bb204b7a7b08a10b",
-        "android_client_info": {
-          "package_name": "im.veon"
+          "package_name": "im.vector.riotx"
         }
       },
       "oauth_client": [
diff --git a/vector/src/gplay/java/im/vector/riotredesign/gplay/features/settings/troubleshoot/TestFirebaseToken.kt b/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
similarity index 89%
rename from vector/src/gplay/java/im/vector/riotredesign/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
rename to vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
index 78b4e4df21..4d35c90464 100644
--- a/vector/src/gplay/java/im/vector/riotredesign/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
+++ b/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.gplay.features.settings.troubleshoot
+package im.vector.riotx.gplay.features.settings.troubleshoot
 
 import androidx.appcompat.app.AppCompatActivity
 import com.google.firebase.iid.FirebaseInstanceId
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.core.utils.startAddGoogleAccountIntent
-import im.vector.riotredesign.features.settings.troubleshoot.NotificationTroubleshootTestManager
-import im.vector.riotredesign.features.settings.troubleshoot.TroubleshootTest
-import im.vector.riotredesign.push.fcm.FcmHelper
+import im.vector.riotx.R
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.core.utils.startAddGoogleAccountIntent
+import im.vector.riotx.features.settings.troubleshoot.NotificationTroubleshootTestManager
+import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
+import im.vector.riotx.push.fcm.FcmHelper
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/gplay/java/im/vector/riotredesign/gplay/features/settings/troubleshoot/TestPlayServices.kt b/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestPlayServices.kt
similarity index 90%
rename from vector/src/gplay/java/im/vector/riotredesign/gplay/features/settings/troubleshoot/TestPlayServices.kt
rename to vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestPlayServices.kt
index f99787c67b..e97f3ceadc 100644
--- a/vector/src/gplay/java/im/vector/riotredesign/gplay/features/settings/troubleshoot/TestPlayServices.kt
+++ b/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestPlayServices.kt
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.gplay.features.settings.troubleshoot
+package im.vector.riotx.gplay.features.settings.troubleshoot
 
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.features.settings.troubleshoot.TroubleshootTest
+import im.vector.riotx.R
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/gplay/java/im/vector/riotredesign/gplay/features/settings/troubleshoot/TestTokenRegistration.kt b/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
similarity index 88%
rename from vector/src/gplay/java/im/vector/riotredesign/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
rename to vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
index 8e4c923da8..b7b499407f 100644
--- a/vector/src/gplay/java/im/vector/riotredesign/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
+++ b/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.gplay.features.settings.troubleshoot
+package im.vector.riotx.gplay.features.settings.troubleshoot
 
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.Observer
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import im.vector.matrix.android.api.session.pushers.PusherState
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.core.pushers.PushersManager
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.features.settings.troubleshoot.TroubleshootTest
-import im.vector.riotredesign.push.fcm.FcmHelper
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.core.pushers.PushersManager
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
+import im.vector.riotx.push.fcm.FcmHelper
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/gplay/java/im/vector/riotredesign/gplay/package-info.kt b/vector/src/gplay/java/im/vector/riotx/gplay/package-info.kt
similarity index 94%
rename from vector/src/gplay/java/im/vector/riotredesign/gplay/package-info.kt
rename to vector/src/gplay/java/im/vector/riotx/gplay/package-info.kt
index 6093852523..177fb56fd8 100644
--- a/vector/src/gplay/java/im/vector/riotredesign/gplay/package-info.kt
+++ b/vector/src/gplay/java/im/vector/riotx/gplay/package-info.kt
@@ -17,5 +17,5 @@
 /**
  * Code exclusively used by the GPlay build and not referenced on the main source code
  */
-package im.vector.riotredesign.gplay
+package im.vector.riotx.gplay
 
diff --git a/vector/src/gplay/java/im/vector/riotredesign/gplay/push/fcm/VectorFirebaseMessagingService.kt b/vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt
similarity index 92%
rename from vector/src/gplay/java/im/vector/riotredesign/gplay/push/fcm/VectorFirebaseMessagingService.kt
rename to vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt
index 177b234649..0be66b170b 100755
--- a/vector/src/gplay/java/im/vector/riotredesign/gplay/push/fcm/VectorFirebaseMessagingService.kt
+++ b/vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.gplay.push.fcm
+package im.vector.riotx.gplay.push.fcm
 
 import android.os.Handler
 import android.os.Looper
@@ -28,21 +28,20 @@ import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.riotredesign.BuildConfig
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.core.extensions.vectorComponent
-import im.vector.riotredesign.core.preference.BingRule
-import im.vector.riotredesign.core.pushers.PushersManager
-import im.vector.riotredesign.features.badge.BadgeProxy
-import im.vector.riotredesign.features.notifications.NotifiableEventResolver
-import im.vector.riotredesign.features.notifications.NotifiableMessageEvent
-import im.vector.riotredesign.features.notifications.NotificationDrawerManager
-import im.vector.riotredesign.features.notifications.SimpleNotifiableEvent
-import im.vector.riotredesign.features.settings.PreferencesManager
-import im.vector.riotredesign.push.fcm.FcmHelper
+import im.vector.riotx.BuildConfig
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.core.extensions.vectorComponent
+import im.vector.riotx.core.preference.BingRule
+import im.vector.riotx.core.pushers.PushersManager
+import im.vector.riotx.features.badge.BadgeProxy
+import im.vector.riotx.features.notifications.NotifiableEventResolver
+import im.vector.riotx.features.notifications.NotifiableMessageEvent
+import im.vector.riotx.features.notifications.NotificationDrawerManager
+import im.vector.riotx.features.notifications.SimpleNotifiableEvent
+import im.vector.riotx.features.settings.PreferencesManager
+import im.vector.riotx.push.fcm.FcmHelper
 import timber.log.Timber
-import javax.inject.Inject
 
 /**
  * Class extending FirebaseMessagingService.
diff --git a/vector/src/gplay/java/im/vector/riotredesign/push/fcm/FcmHelper.kt b/vector/src/gplay/java/im/vector/riotx/push/fcm/FcmHelper.kt
similarity index 95%
rename from vector/src/gplay/java/im/vector/riotredesign/push/fcm/FcmHelper.kt
rename to vector/src/gplay/java/im/vector/riotx/push/fcm/FcmHelper.kt
index ca807f366f..c19aa561d0 100755
--- a/vector/src/gplay/java/im/vector/riotredesign/push/fcm/FcmHelper.kt
+++ b/vector/src/gplay/java/im/vector/riotx/push/fcm/FcmHelper.kt
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.push.fcm
+package im.vector.riotx.push.fcm
 
 import android.app.Activity
 import android.content.Context
@@ -24,9 +24,9 @@ import android.widget.Toast
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
 import com.google.firebase.iid.FirebaseInstanceId
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.core.pushers.PushersManager
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.core.pushers.PushersManager
 import timber.log.Timber
 
 /**
diff --git a/vector/src/gplay/java/im/vector/riotredesign/push/fcm/NotificationTroubleshootTestManagerFactory.kt b/vector/src/gplay/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt
similarity index 73%
rename from vector/src/gplay/java/im/vector/riotredesign/push/fcm/NotificationTroubleshootTestManagerFactory.kt
rename to vector/src/gplay/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt
index d7459b7e09..3d2e45fed1 100644
--- a/vector/src/gplay/java/im/vector/riotredesign/push/fcm/NotificationTroubleshootTestManagerFactory.kt
+++ b/vector/src/gplay/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.push.fcm
+package im.vector.riotx.push.fcm
 
 import androidx.fragment.app.Fragment
-import im.vector.riotredesign.features.settings.troubleshoot.NotificationTroubleshootTestManager
-import im.vector.riotredesign.features.settings.troubleshoot.TestAccountSettings
-import im.vector.riotredesign.features.settings.troubleshoot.TestBingRulesSettings
-import im.vector.riotredesign.features.settings.troubleshoot.TestDeviceSettings
-import im.vector.riotredesign.features.settings.troubleshoot.TestSystemSettings
-import im.vector.riotredesign.gplay.features.settings.troubleshoot.TestFirebaseToken
-import im.vector.riotredesign.gplay.features.settings.troubleshoot.TestPlayServices
-import im.vector.riotredesign.gplay.features.settings.troubleshoot.TestTokenRegistration
+import im.vector.riotx.features.settings.troubleshoot.NotificationTroubleshootTestManager
+import im.vector.riotx.features.settings.troubleshoot.TestAccountSettings
+import im.vector.riotx.features.settings.troubleshoot.TestBingRulesSettings
+import im.vector.riotx.features.settings.troubleshoot.TestDeviceSettings
+import im.vector.riotx.features.settings.troubleshoot.TestSystemSettings
+import im.vector.riotx.gplay.features.settings.troubleshoot.TestFirebaseToken
+import im.vector.riotx.gplay.features.settings.troubleshoot.TestPlayServices
+import im.vector.riotx.gplay.features.settings.troubleshoot.TestTokenRegistration
 import javax.inject.Inject
 
 class NotificationTroubleshootTestManagerFactory @Inject constructor(private val testSystemSettings: TestSystemSettings,
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 8fa242175f..7e5242ab2e 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="im.vector.riotredesign">
+    package="im.vector.riotx">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
@@ -46,13 +46,13 @@
             android:name=".features.crypto.verification.SASVerificationActivity"
             android:label="@string/title_activity_verify_device" />
         <activity
-            android:name="im.vector.riotredesign.features.crypto.keysbackup.restore.KeysBackupRestoreActivity"
+            android:name=".features.crypto.keysbackup.restore.KeysBackupRestoreActivity"
             android:label="@string/title_activity_keys_backup_setup" />
         <activity
-            android:name="im.vector.riotredesign.features.crypto.keysbackup.setup.KeysBackupSetupActivity"
+            android:name=".features.crypto.keysbackup.setup.KeysBackupSetupActivity"
             android:label="@string/title_activity_keys_backup_restore" />
         <activity
-            android:name="im.vector.riotredesign.features.crypto.keysbackup.settings.KeysBackupManageActivity"
+            android:name=".features.crypto.keysbackup.settings.KeysBackupManageActivity"
             android:label="@string/encryption_message_recovery" />
 
         <activity
diff --git a/vector/src/main/java/im/vector/riotredesign/EmojiCompatFontProvider.kt b/vector/src/main/java/im/vector/riotx/EmojiCompatFontProvider.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotredesign/EmojiCompatFontProvider.kt
rename to vector/src/main/java/im/vector/riotx/EmojiCompatFontProvider.kt
index 9a576e43a0..994cb13664 100644
--- a/vector/src/main/java/im/vector/riotredesign/EmojiCompatFontProvider.kt
+++ b/vector/src/main/java/im/vector/riotx/EmojiCompatFontProvider.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign
+package im.vector.riotx
 
 import android.graphics.Typeface
 import androidx.core.provider.FontsContractCompat
diff --git a/vector/src/main/java/im/vector/riotredesign/VectorApplication.kt b/vector/src/main/java/im/vector/riotx/VectorApplication.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotredesign/VectorApplication.kt
rename to vector/src/main/java/im/vector/riotx/VectorApplication.kt
index 0327f652bc..f9416fc0a0 100644
--- a/vector/src/main/java/im/vector/riotredesign/VectorApplication.kt
+++ b/vector/src/main/java/im/vector/riotx/VectorApplication.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign
+package im.vector.riotx
 
 import android.app.Application
 import android.content.Context
@@ -37,24 +37,24 @@ import com.jakewharton.threetenabp.AndroidThreeTen
 import im.vector.matrix.android.api.Matrix
 import im.vector.matrix.android.api.MatrixConfiguration
 import im.vector.matrix.android.api.auth.Authenticator
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.core.di.DaggerVectorComponent
-import im.vector.riotredesign.core.di.HasVectorInjector
-import im.vector.riotredesign.core.di.VectorComponent
-import im.vector.riotredesign.core.extensions.configureAndStart
-import im.vector.riotredesign.features.configuration.VectorConfiguration
-import im.vector.riotredesign.features.lifecycle.VectorActivityLifecycleCallbacks
-import im.vector.riotredesign.features.notifications.NotificationDrawerManager
-import im.vector.riotredesign.features.notifications.NotificationUtils
-import im.vector.riotredesign.features.notifications.PushRuleTriggerListener
-import im.vector.riotredesign.features.rageshake.VectorFileLogger
-import im.vector.riotredesign.features.rageshake.VectorUncaughtExceptionHandler
-import im.vector.riotredesign.features.version.getVersion
-import im.vector.riotredesign.push.fcm.FcmHelper
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.core.di.DaggerVectorComponent
+import im.vector.riotx.core.di.HasVectorInjector
+import im.vector.riotx.core.di.VectorComponent
+import im.vector.riotx.core.extensions.configureAndStart
+import im.vector.riotx.features.configuration.VectorConfiguration
+import im.vector.riotx.features.lifecycle.VectorActivityLifecycleCallbacks
+import im.vector.riotx.features.notifications.NotificationDrawerManager
+import im.vector.riotx.features.notifications.NotificationUtils
+import im.vector.riotx.features.notifications.PushRuleTriggerListener
+import im.vector.riotx.features.rageshake.VectorFileLogger
+import im.vector.riotx.features.rageshake.VectorUncaughtExceptionHandler
+import im.vector.riotx.features.version.getVersion
+import im.vector.riotx.push.fcm.FcmHelper
 import timber.log.Timber
 import java.text.SimpleDateFormat
 import java.util.*
-import im.vector.riotredesign.core.utils.initKnownEmojiHashSet
+import im.vector.riotx.core.utils.initKnownEmojiHashSet
 import javax.inject.Inject
 
 class VectorApplication : Application(), HasVectorInjector, MatrixConfiguration.Provider, androidx.work.Configuration.Provider {
diff --git a/vector/src/main/java/im/vector/riotredesign/core/animations/Constants.kt b/vector/src/main/java/im/vector/riotx/core/animations/Constants.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/core/animations/Constants.kt
rename to vector/src/main/java/im/vector/riotx/core/animations/Constants.kt
index 4d9c59aa7d..ccc18c4915 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/animations/Constants.kt
+++ b/vector/src/main/java/im/vector/riotx/core/animations/Constants.kt
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.animations
+package im.vector.riotx.core.animations
 
 const val ANIMATION_DURATION_SHORT = 200L
diff --git a/vector/src/main/java/im/vector/riotredesign/core/animations/SimpleAnimatorListener.kt b/vector/src/main/java/im/vector/riotx/core/animations/SimpleAnimatorListener.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/core/animations/SimpleAnimatorListener.kt
rename to vector/src/main/java/im/vector/riotx/core/animations/SimpleAnimatorListener.kt
index f1aad8f186..5968ee19c4 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/animations/SimpleAnimatorListener.kt
+++ b/vector/src/main/java/im/vector/riotx/core/animations/SimpleAnimatorListener.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.animations
+package im.vector.riotx.core.animations
 
 import android.animation.Animator
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/animations/SimpleTransitionListener.kt b/vector/src/main/java/im/vector/riotx/core/animations/SimpleTransitionListener.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/core/animations/SimpleTransitionListener.kt
rename to vector/src/main/java/im/vector/riotx/core/animations/SimpleTransitionListener.kt
index 0e644990ca..a83b0cffe5 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/animations/SimpleTransitionListener.kt
+++ b/vector/src/main/java/im/vector/riotx/core/animations/SimpleTransitionListener.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.animations
+package im.vector.riotx.core.animations
 
 import androidx.transition.Transition
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/animations/VectorFullTransitionSet.kt b/vector/src/main/java/im/vector/riotx/core/animations/VectorFullTransitionSet.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/core/animations/VectorFullTransitionSet.kt
rename to vector/src/main/java/im/vector/riotx/core/animations/VectorFullTransitionSet.kt
index 666e6ced76..d2d9a224c4 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/animations/VectorFullTransitionSet.kt
+++ b/vector/src/main/java/im/vector/riotx/core/animations/VectorFullTransitionSet.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.animations
+package im.vector.riotx.core.animations
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/vector/src/main/java/im/vector/riotredesign/core/di/ActiveSessionHolder.kt b/vector/src/main/java/im/vector/riotx/core/di/ActiveSessionHolder.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/core/di/ActiveSessionHolder.kt
rename to vector/src/main/java/im/vector/riotx/core/di/ActiveSessionHolder.kt
index 83af1ce9d0..517284d571 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/di/ActiveSessionHolder.kt
+++ b/vector/src/main/java/im/vector/riotx/core/di/ActiveSessionHolder.kt
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.di
+package im.vector.riotx.core.di
 
 import im.vector.matrix.android.api.auth.Authenticator
 import im.vector.matrix.android.api.auth.data.SessionParams
 import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.sync.FilterService
 import java.lang.IllegalStateException
 import java.util.concurrent.atomic.AtomicReference
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotredesign/core/di/HasScreenInjector.kt b/vector/src/main/java/im/vector/riotx/core/di/HasScreenInjector.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/core/di/HasScreenInjector.kt
rename to vector/src/main/java/im/vector/riotx/core/di/HasScreenInjector.kt
index 746c0c186f..44594971a0 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/di/HasScreenInjector.kt
+++ b/vector/src/main/java/im/vector/riotx/core/di/HasScreenInjector.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.di
+package im.vector.riotx.core.di
 
 interface HasScreenInjector {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/di/HasVectorInjector.kt b/vector/src/main/java/im/vector/riotx/core/di/HasVectorInjector.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/core/di/HasVectorInjector.kt
rename to vector/src/main/java/im/vector/riotx/core/di/HasVectorInjector.kt
index 7b33a04b56..2058133b68 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/di/HasVectorInjector.kt
+++ b/vector/src/main/java/im/vector/riotx/core/di/HasVectorInjector.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.di
+package im.vector.riotx.core.di
 
 interface HasVectorInjector {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/di/ScreenComponent.kt b/vector/src/main/java/im/vector/riotx/core/di/ScreenComponent.kt
similarity index 57%
rename from vector/src/main/java/im/vector/riotredesign/core/di/ScreenComponent.kt
rename to vector/src/main/java/im/vector/riotx/core/di/ScreenComponent.kt
index f20ddc5d6e..de5735f989 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/di/ScreenComponent.kt
+++ b/vector/src/main/java/im/vector/riotx/core/di/ScreenComponent.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.di
+package im.vector.riotx.core.di
 
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModelProvider
@@ -22,41 +22,41 @@ import dagger.BindsInstance
 import dagger.Component
 import im.vector.fragments.keysbackup.restore.KeysBackupRestoreFromPassphraseFragment
 import im.vector.matrix.android.api.session.Session
-import im.vector.riotredesign.core.preference.UserAvatarPreference
-import im.vector.riotredesign.features.MainActivity
-import im.vector.riotredesign.features.crypto.keysbackup.restore.KeysBackupRestoreFromKeyFragment
-import im.vector.riotredesign.features.crypto.keysbackup.restore.KeysBackupRestoreSuccessFragment
-import im.vector.riotredesign.features.crypto.keysbackup.settings.KeysBackupManageActivity
-import im.vector.riotredesign.features.crypto.keysbackup.settings.KeysBackupSettingsFragment
-import im.vector.riotredesign.features.crypto.keysbackup.setup.KeysBackupSetupStep1Fragment
-import im.vector.riotredesign.features.crypto.keysbackup.setup.KeysBackupSetupStep2Fragment
-import im.vector.riotredesign.features.crypto.keysbackup.setup.KeysBackupSetupStep3Fragment
-import im.vector.riotredesign.features.crypto.verification.SASVerificationIncomingFragment
-import im.vector.riotredesign.features.home.*
-import im.vector.riotredesign.features.home.group.GroupListFragment
-import im.vector.riotredesign.features.home.room.detail.RoomDetailFragment
-import im.vector.riotredesign.features.home.room.detail.timeline.action.MessageActionsBottomSheet
-import im.vector.riotredesign.features.home.room.detail.timeline.action.MessageMenuFragment
-import im.vector.riotredesign.features.home.room.detail.timeline.action.QuickReactionFragment
-import im.vector.riotredesign.features.home.room.detail.timeline.action.ViewReactionBottomSheet
-import im.vector.riotredesign.features.home.room.list.RoomListFragment
-import im.vector.riotredesign.features.invite.VectorInviteView
-import im.vector.riotredesign.features.login.LoginActivity
-import im.vector.riotredesign.features.media.ImageMediaViewerActivity
-import im.vector.riotredesign.features.media.VideoMediaViewerActivity
-import im.vector.riotredesign.features.rageshake.BugReportActivity
-import im.vector.riotredesign.features.rageshake.BugReporter
-import im.vector.riotredesign.features.rageshake.RageShake
-import im.vector.riotredesign.features.reactions.EmojiReactionPickerActivity
-import im.vector.riotredesign.features.roomdirectory.PublicRoomsFragment
-import im.vector.riotredesign.features.roomdirectory.RoomDirectoryActivity
-import im.vector.riotredesign.features.roomdirectory.createroom.CreateRoomFragment
-import im.vector.riotredesign.features.roomdirectory.picker.RoomDirectoryPickerFragment
-import im.vector.riotredesign.features.roomdirectory.roompreview.RoomPreviewNoPreviewFragment
-import im.vector.riotredesign.features.settings.VectorSettingsActivity
-import im.vector.riotredesign.features.settings.VectorSettingsNotificationPreferenceFragment
-import im.vector.riotredesign.features.settings.VectorSettingsNotificationsTroubleshootFragment
-import im.vector.riotredesign.features.settings.VectorSettingsPreferencesFragment
+import im.vector.riotx.core.preference.UserAvatarPreference
+import im.vector.riotx.features.MainActivity
+import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreFromKeyFragment
+import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreSuccessFragment
+import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupManageActivity
+import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupSettingsFragment
+import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupStep1Fragment
+import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupStep2Fragment
+import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupStep3Fragment
+import im.vector.riotx.features.crypto.verification.SASVerificationIncomingFragment
+import im.vector.riotx.features.home.*
+import im.vector.riotx.features.home.group.GroupListFragment
+import im.vector.riotx.features.home.room.detail.RoomDetailFragment
+import im.vector.riotx.features.home.room.detail.timeline.action.MessageActionsBottomSheet
+import im.vector.riotx.features.home.room.detail.timeline.action.MessageMenuFragment
+import im.vector.riotx.features.home.room.detail.timeline.action.QuickReactionFragment
+import im.vector.riotx.features.home.room.detail.timeline.action.ViewReactionBottomSheet
+import im.vector.riotx.features.home.room.list.RoomListFragment
+import im.vector.riotx.features.invite.VectorInviteView
+import im.vector.riotx.features.login.LoginActivity
+import im.vector.riotx.features.media.ImageMediaViewerActivity
+import im.vector.riotx.features.media.VideoMediaViewerActivity
+import im.vector.riotx.features.rageshake.BugReportActivity
+import im.vector.riotx.features.rageshake.BugReporter
+import im.vector.riotx.features.rageshake.RageShake
+import im.vector.riotx.features.reactions.EmojiReactionPickerActivity
+import im.vector.riotx.features.roomdirectory.PublicRoomsFragment
+import im.vector.riotx.features.roomdirectory.RoomDirectoryActivity
+import im.vector.riotx.features.roomdirectory.createroom.CreateRoomFragment
+import im.vector.riotx.features.roomdirectory.picker.RoomDirectoryPickerFragment
+import im.vector.riotx.features.roomdirectory.roompreview.RoomPreviewNoPreviewFragment
+import im.vector.riotx.features.settings.VectorSettingsActivity
+import im.vector.riotx.features.settings.VectorSettingsNotificationPreferenceFragment
+import im.vector.riotx.features.settings.VectorSettingsNotificationsTroubleshootFragment
+import im.vector.riotx.features.settings.VectorSettingsPreferencesFragment
 
 @Component(dependencies = [VectorComponent::class], modules = [ViewModelModule::class, HomeModule::class])
 @ScreenScope
diff --git a/vector/src/main/java/im/vector/riotredesign/core/di/ScreenModule.kt b/vector/src/main/java/im/vector/riotx/core/di/ScreenModule.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotredesign/core/di/ScreenModule.kt
rename to vector/src/main/java/im/vector/riotx/core/di/ScreenModule.kt
index 3ea6433214..64c0f34ce8 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/di/ScreenModule.kt
+++ b/vector/src/main/java/im/vector/riotx/core/di/ScreenModule.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.di
+package im.vector.riotx.core.di
 
 import androidx.appcompat.app.AppCompatActivity
 import dagger.Module
 import dagger.Provides
-import im.vector.riotredesign.core.glide.GlideApp
+import im.vector.riotx.core.glide.GlideApp
 
 @Module
 object ScreenModule {
diff --git a/vector/src/main/java/im/vector/riotredesign/core/di/ScreenScope.java b/vector/src/main/java/im/vector/riotx/core/di/ScreenScope.java
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/core/di/ScreenScope.java
rename to vector/src/main/java/im/vector/riotx/core/di/ScreenScope.java
index ecd68a4e9c..a2243eabda 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/di/ScreenScope.java
+++ b/vector/src/main/java/im/vector/riotx/core/di/ScreenScope.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.di;
+package im.vector.riotx.core.di;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
diff --git a/vector/src/main/java/im/vector/riotredesign/core/di/VectorAssistedModule.kt b/vector/src/main/java/im/vector/riotx/core/di/VectorAssistedModule.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/core/di/VectorAssistedModule.kt
rename to vector/src/main/java/im/vector/riotx/core/di/VectorAssistedModule.kt
index bbf37bfe4e..9d04521d49 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/di/VectorAssistedModule.kt
+++ b/vector/src/main/java/im/vector/riotx/core/di/VectorAssistedModule.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.di
+package im.vector.riotx.core.di
 
 /*
 @Module(includes = [AssistedInject_VectorAssistedModule::class])
diff --git a/vector/src/main/java/im/vector/riotredesign/core/di/VectorComponent.kt b/vector/src/main/java/im/vector/riotx/core/di/VectorComponent.kt
similarity index 64%
rename from vector/src/main/java/im/vector/riotredesign/core/di/VectorComponent.kt
rename to vector/src/main/java/im/vector/riotx/core/di/VectorComponent.kt
index ffc3a126e9..37bee65e0b 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/di/VectorComponent.kt
+++ b/vector/src/main/java/im/vector/riotx/core/di/VectorComponent.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.di
+package im.vector.riotx.core.di
 
 import android.content.Context
 import android.content.res.Resources
@@ -23,23 +23,23 @@ import dagger.Component
 import im.vector.matrix.android.api.Matrix
 import im.vector.matrix.android.api.auth.Authenticator
 import im.vector.matrix.android.api.session.Session
-import im.vector.riotredesign.EmojiCompatFontProvider
-import im.vector.riotredesign.VectorApplication
-import im.vector.riotredesign.core.pushers.PushersManager
-import im.vector.riotredesign.features.configuration.VectorConfiguration
-import im.vector.riotredesign.features.crypto.keysrequest.KeyRequestHandler
-import im.vector.riotredesign.features.crypto.verification.IncomingVerificationRequestHandler
-import im.vector.riotredesign.features.home.AvatarRenderer
-import im.vector.riotredesign.features.home.HomeNavigator
-import im.vector.riotredesign.features.home.HomeRoomListObservableStore
-import im.vector.riotredesign.features.home.group.SelectedGroupStore
-import im.vector.riotredesign.features.navigation.Navigator
-import im.vector.riotredesign.features.notifications.NotifiableEventResolver
-import im.vector.riotredesign.features.notifications.NotificationBroadcastReceiver
-import im.vector.riotredesign.features.notifications.NotificationDrawerManager
-import im.vector.riotredesign.features.notifications.PushRuleTriggerListener
-import im.vector.riotredesign.features.rageshake.BugReporter
-import im.vector.riotredesign.features.rageshake.VectorUncaughtExceptionHandler
+import im.vector.riotx.EmojiCompatFontProvider
+import im.vector.riotx.VectorApplication
+import im.vector.riotx.core.pushers.PushersManager
+import im.vector.riotx.features.configuration.VectorConfiguration
+import im.vector.riotx.features.crypto.keysrequest.KeyRequestHandler
+import im.vector.riotx.features.crypto.verification.IncomingVerificationRequestHandler
+import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.riotx.features.home.HomeNavigator
+import im.vector.riotx.features.home.HomeRoomListObservableStore
+import im.vector.riotx.features.home.group.SelectedGroupStore
+import im.vector.riotx.features.navigation.Navigator
+import im.vector.riotx.features.notifications.NotifiableEventResolver
+import im.vector.riotx.features.notifications.NotificationBroadcastReceiver
+import im.vector.riotx.features.notifications.NotificationDrawerManager
+import im.vector.riotx.features.notifications.PushRuleTriggerListener
+import im.vector.riotx.features.rageshake.BugReporter
+import im.vector.riotx.features.rageshake.VectorUncaughtExceptionHandler
 import javax.inject.Singleton
 
 @Component(modules = [VectorModule::class])
diff --git a/vector/src/main/java/im/vector/riotredesign/core/di/VectorModule.kt b/vector/src/main/java/im/vector/riotx/core/di/VectorModule.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotredesign/core/di/VectorModule.kt
rename to vector/src/main/java/im/vector/riotx/core/di/VectorModule.kt
index b1c6c7e743..251fc0b1e9 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/di/VectorModule.kt
+++ b/vector/src/main/java/im/vector/riotx/core/di/VectorModule.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.di
+package im.vector.riotx.core.di
 
 import android.content.Context
 import android.content.Context.MODE_PRIVATE
@@ -26,8 +26,8 @@ import dagger.Provides
 import im.vector.matrix.android.api.Matrix
 import im.vector.matrix.android.api.auth.Authenticator
 import im.vector.matrix.android.api.session.Session
-import im.vector.riotredesign.features.navigation.DefaultNavigator
-import im.vector.riotredesign.features.navigation.Navigator
+import im.vector.riotx.features.navigation.DefaultNavigator
+import im.vector.riotx.features.navigation.Navigator
 
 @Module
 abstract class VectorModule {
diff --git a/vector/src/main/java/im/vector/riotredesign/core/di/VectorViewModelFactory.kt b/vector/src/main/java/im/vector/riotx/core/di/VectorViewModelFactory.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/core/di/VectorViewModelFactory.kt
rename to vector/src/main/java/im/vector/riotx/core/di/VectorViewModelFactory.kt
index eac1b52ea0..999b004beb 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/di/VectorViewModelFactory.kt
+++ b/vector/src/main/java/im/vector/riotx/core/di/VectorViewModelFactory.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.di
+package im.vector.riotx.core.di
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
diff --git a/vector/src/main/java/im/vector/riotredesign/core/di/ViewModelKey.kt b/vector/src/main/java/im/vector/riotx/core/di/ViewModelKey.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotredesign/core/di/ViewModelKey.kt
rename to vector/src/main/java/im/vector/riotx/core/di/ViewModelKey.kt
index c088742376..09be563398 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/di/ViewModelKey.kt
+++ b/vector/src/main/java/im/vector/riotx/core/di/ViewModelKey.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.di
+package im.vector.riotx.core.di
 
 import androidx.lifecycle.ViewModel
 import dagger.MapKey
diff --git a/vector/src/main/java/im/vector/riotredesign/core/di/ViewModelModule.kt b/vector/src/main/java/im/vector/riotx/core/di/ViewModelModule.kt
similarity index 61%
rename from vector/src/main/java/im/vector/riotredesign/core/di/ViewModelModule.kt
rename to vector/src/main/java/im/vector/riotx/core/di/ViewModelModule.kt
index df984d230c..ab143c623c 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/di/ViewModelModule.kt
+++ b/vector/src/main/java/im/vector/riotx/core/di/ViewModelModule.kt
@@ -14,46 +14,46 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.di
+package im.vector.riotx.core.di
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import dagger.Binds
 import dagger.Module
 import dagger.multibindings.IntoMap
-import im.vector.riotredesign.core.platform.ConfigurationViewModel
-import im.vector.riotredesign.features.crypto.keysbackup.restore.KeysBackupRestoreFromKeyViewModel
-import im.vector.riotredesign.features.crypto.keysbackup.restore.KeysBackupRestoreFromPassphraseViewModel
-import im.vector.riotredesign.features.crypto.keysbackup.restore.KeysBackupRestoreSharedViewModel
-import im.vector.riotredesign.features.crypto.keysbackup.settings.KeysBackupSettingsViewModel
-import im.vector.riotredesign.features.crypto.keysbackup.settings.KeysBackupSettingsViewModel_AssistedFactory
-import im.vector.riotredesign.features.crypto.keysbackup.setup.KeysBackupSetupSharedViewModel
-import im.vector.riotredesign.features.crypto.verification.SasVerificationViewModel
-import im.vector.riotredesign.features.home.HomeActivityViewModel
-import im.vector.riotredesign.features.home.HomeActivityViewModel_AssistedFactory
-import im.vector.riotredesign.features.home.HomeDetailViewModel
-import im.vector.riotredesign.features.home.HomeDetailViewModel_AssistedFactory
-import im.vector.riotredesign.features.home.HomeNavigationViewModel
-import im.vector.riotredesign.features.home.group.GroupListViewModel
-import im.vector.riotredesign.features.home.group.GroupListViewModel_AssistedFactory
-import im.vector.riotredesign.features.home.room.detail.RoomDetailViewModel
-import im.vector.riotredesign.features.home.room.detail.RoomDetailViewModel_AssistedFactory
-import im.vector.riotredesign.features.home.room.detail.composer.TextComposerViewModel
-import im.vector.riotredesign.features.home.room.detail.composer.TextComposerViewModel_AssistedFactory
-import im.vector.riotredesign.features.home.room.detail.timeline.action.*
-import im.vector.riotredesign.features.home.room.list.RoomListViewModel
-import im.vector.riotredesign.features.home.room.list.RoomListViewModel_AssistedFactory
-import im.vector.riotredesign.features.reactions.EmojiChooserViewModel
-import im.vector.riotredesign.features.roomdirectory.RoomDirectoryNavigationViewModel
-import im.vector.riotredesign.features.roomdirectory.RoomDirectoryViewModel
-import im.vector.riotredesign.features.roomdirectory.RoomDirectoryViewModel_AssistedFactory
-import im.vector.riotredesign.features.roomdirectory.createroom.CreateRoomViewModel
-import im.vector.riotredesign.features.roomdirectory.createroom.CreateRoomViewModel_AssistedFactory
-import im.vector.riotredesign.features.roomdirectory.picker.RoomDirectoryPickerViewModel
-import im.vector.riotredesign.features.roomdirectory.picker.RoomDirectoryPickerViewModel_AssistedFactory
-import im.vector.riotredesign.features.roomdirectory.roompreview.RoomPreviewViewModel
-import im.vector.riotredesign.features.roomdirectory.roompreview.RoomPreviewViewModel_AssistedFactory
-import im.vector.riotredesign.features.workers.signout.SignOutViewModel
+import im.vector.riotx.core.platform.ConfigurationViewModel
+import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreFromKeyViewModel
+import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreFromPassphraseViewModel
+import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreSharedViewModel
+import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupSettingsViewModel
+import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupSettingsViewModel_AssistedFactory
+import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupSharedViewModel
+import im.vector.riotx.features.crypto.verification.SasVerificationViewModel
+import im.vector.riotx.features.home.HomeActivityViewModel
+import im.vector.riotx.features.home.HomeActivityViewModel_AssistedFactory
+import im.vector.riotx.features.home.HomeDetailViewModel
+import im.vector.riotx.features.home.HomeDetailViewModel_AssistedFactory
+import im.vector.riotx.features.home.HomeNavigationViewModel
+import im.vector.riotx.features.home.group.GroupListViewModel
+import im.vector.riotx.features.home.group.GroupListViewModel_AssistedFactory
+import im.vector.riotx.features.home.room.detail.RoomDetailViewModel
+import im.vector.riotx.features.home.room.detail.RoomDetailViewModel_AssistedFactory
+import im.vector.riotx.features.home.room.detail.composer.TextComposerViewModel
+import im.vector.riotx.features.home.room.detail.composer.TextComposerViewModel_AssistedFactory
+import im.vector.riotx.features.home.room.detail.timeline.action.*
+import im.vector.riotx.features.home.room.list.RoomListViewModel
+import im.vector.riotx.features.home.room.list.RoomListViewModel_AssistedFactory
+import im.vector.riotx.features.reactions.EmojiChooserViewModel
+import im.vector.riotx.features.roomdirectory.RoomDirectoryNavigationViewModel
+import im.vector.riotx.features.roomdirectory.RoomDirectoryViewModel
+import im.vector.riotx.features.roomdirectory.RoomDirectoryViewModel_AssistedFactory
+import im.vector.riotx.features.roomdirectory.createroom.CreateRoomViewModel
+import im.vector.riotx.features.roomdirectory.createroom.CreateRoomViewModel_AssistedFactory
+import im.vector.riotx.features.roomdirectory.picker.RoomDirectoryPickerViewModel
+import im.vector.riotx.features.roomdirectory.picker.RoomDirectoryPickerViewModel_AssistedFactory
+import im.vector.riotx.features.roomdirectory.roompreview.RoomPreviewViewModel
+import im.vector.riotx.features.roomdirectory.roompreview.RoomPreviewViewModel_AssistedFactory
+import im.vector.riotx.features.workers.signout.SignOutViewModel
 
 @Module
 interface ViewModelModule {
diff --git a/vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogAdapter.kt b/vector/src/main/java/im/vector/riotx/core/dialogs/DialogAdapter.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogAdapter.kt
rename to vector/src/main/java/im/vector/riotx/core/dialogs/DialogAdapter.kt
index 5f51350e05..0cc8479921 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogAdapter.kt
+++ b/vector/src/main/java/im/vector/riotx/core/dialogs/DialogAdapter.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.dialogs
+package im.vector.riotx.core.dialogs
 
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 internal abstract class DialogAdapter(context: Context) : ArrayAdapter<DialogListItem>(context, R.layout.item_dialog) {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogCallAdapter.kt b/vector/src/main/java/im/vector/riotx/core/dialogs/DialogCallAdapter.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogCallAdapter.kt
rename to vector/src/main/java/im/vector/riotx/core/dialogs/DialogCallAdapter.kt
index 5f0a954dce..0b0499a637 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogCallAdapter.kt
+++ b/vector/src/main/java/im/vector/riotx/core/dialogs/DialogCallAdapter.kt
@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.dialogs
+package im.vector.riotx.core.dialogs
 
 import android.content.Context
-import im.vector.riotredesign.core.dialogs.DialogAdapter
-import im.vector.riotredesign.core.dialogs.DialogListItem
 
 internal class DialogCallAdapter(context: Context) : DialogAdapter(context) {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogListItem.kt b/vector/src/main/java/im/vector/riotx/core/dialogs/DialogListItem.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogListItem.kt
rename to vector/src/main/java/im/vector/riotx/core/dialogs/DialogListItem.kt
index d070b526a0..1486e870f3 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogListItem.kt
+++ b/vector/src/main/java/im/vector/riotx/core/dialogs/DialogListItem.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.dialogs
+package im.vector.riotx.core.dialogs
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 internal sealed class DialogListItem(@DrawableRes val iconRes: Int,
                                      @StringRes val titleRes: Int) {
diff --git a/vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogListItemHolder.kt b/vector/src/main/java/im/vector/riotx/core/dialogs/DialogListItemHolder.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogListItemHolder.kt
rename to vector/src/main/java/im/vector/riotx/core/dialogs/DialogListItemHolder.kt
index f6ec5522b5..af8456ba1b 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogListItemHolder.kt
+++ b/vector/src/main/java/im/vector/riotx/core/dialogs/DialogListItemHolder.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.dialogs
+package im.vector.riotx.core.dialogs
 
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 class DialogListItemHolder(view: View) {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogLocker.kt b/vector/src/main/java/im/vector/riotx/core/dialogs/DialogLocker.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogLocker.kt
rename to vector/src/main/java/im/vector/riotx/core/dialogs/DialogLocker.kt
index 19e75ce063..5418e2270a 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogLocker.kt
+++ b/vector/src/main/java/im/vector/riotx/core/dialogs/DialogLocker.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.dialogs
+package im.vector.riotx.core.dialogs
 
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
-import im.vector.riotredesign.core.platform.Restorable
+import im.vector.riotx.core.platform.Restorable
 import timber.log.Timber
 
 private const val KEY_DIALOG_IS_DISPLAYED = "DialogLocker.KEY_DIALOG_IS_DISPLAYED"
diff --git a/vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogSendItemAdapter.kt b/vector/src/main/java/im/vector/riotx/core/dialogs/DialogSendItemAdapter.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogSendItemAdapter.kt
rename to vector/src/main/java/im/vector/riotx/core/dialogs/DialogSendItemAdapter.kt
index e1acddea9e..8689168e77 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogSendItemAdapter.kt
+++ b/vector/src/main/java/im/vector/riotx/core/dialogs/DialogSendItemAdapter.kt
@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.dialogs
+package im.vector.riotx.core.dialogs
 
 import android.content.Context
-import im.vector.riotredesign.core.dialogs.DialogAdapter
-import im.vector.riotredesign.core.dialogs.DialogListItem
 
 internal class DialogSendItemAdapter(context: Context, items: MutableList<DialogListItem>) : DialogAdapter(context) {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/dialogs/ExportKeysDialog.kt b/vector/src/main/java/im/vector/riotx/core/dialogs/ExportKeysDialog.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/core/dialogs/ExportKeysDialog.kt
rename to vector/src/main/java/im/vector/riotx/core/dialogs/ExportKeysDialog.kt
index 22ec2f906b..25b2bb1004 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/dialogs/ExportKeysDialog.kt
+++ b/vector/src/main/java/im/vector/riotx/core/dialogs/ExportKeysDialog.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.dialogs
+package im.vector.riotx.core.dialogs
 
 import android.app.Activity
 import android.text.Editable
@@ -24,9 +24,9 @@ import android.widget.ImageView
 import androidx.appcompat.app.AlertDialog
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.extensions.showPassword
-import im.vector.riotredesign.core.platform.SimpleTextWatcher
+import im.vector.riotx.R
+import im.vector.riotx.core.extensions.showPassword
+import im.vector.riotx.core.platform.SimpleTextWatcher
 
 class ExportKeysDialog {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/epoxy/EmptyItem.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/EmptyItem.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotredesign/core/epoxy/EmptyItem.kt
rename to vector/src/main/java/im/vector/riotx/core/epoxy/EmptyItem.kt
index 6ed5026b8c..32d7183c1d 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/epoxy/EmptyItem.kt
+++ b/vector/src/main/java/im/vector/riotx/core/epoxy/EmptyItem.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.epoxy
+package im.vector.riotx.core.epoxy
 
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 @EpoxyModelClass(layout = R.layout.item_empty)
 abstract class EmptyItem : VectorEpoxyModel<EmptyItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotredesign/core/epoxy/ErrorWithRetryItem.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/ErrorWithRetryItem.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/core/epoxy/ErrorWithRetryItem.kt
rename to vector/src/main/java/im/vector/riotx/core/epoxy/ErrorWithRetryItem.kt
index f390285695..857de071e2 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/epoxy/ErrorWithRetryItem.kt
+++ b/vector/src/main/java/im/vector/riotx/core/epoxy/ErrorWithRetryItem.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.epoxy
+package im.vector.riotx.core.epoxy
 
 import android.widget.Button
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 @EpoxyModelClass(layout = R.layout.item_error_retry)
 abstract class ErrorWithRetryItem : VectorEpoxyModel<ErrorWithRetryItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotredesign/core/epoxy/LayoutManagerStateRestorer.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/LayoutManagerStateRestorer.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotredesign/core/epoxy/LayoutManagerStateRestorer.kt
rename to vector/src/main/java/im/vector/riotx/core/epoxy/LayoutManagerStateRestorer.kt
index b4b9f181af..d6e149cd8f 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/epoxy/LayoutManagerStateRestorer.kt
+++ b/vector/src/main/java/im/vector/riotx/core/epoxy/LayoutManagerStateRestorer.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.epoxy
+package im.vector.riotx.core.epoxy
 
 import android.os.Bundle
 import android.os.Parcelable
 import androidx.recyclerview.widget.RecyclerView
-import im.vector.riotredesign.core.platform.DefaultListUpdateCallback
-import im.vector.riotredesign.core.platform.Restorable
+import im.vector.riotx.core.platform.DefaultListUpdateCallback
+import im.vector.riotx.core.platform.Restorable
 import java.util.concurrent.atomic.AtomicReference
 
 private const val LAYOUT_MANAGER_STATE = "LAYOUT_MANAGER_STATE"
diff --git a/vector/src/main/java/im/vector/riotredesign/core/epoxy/LoadingItem.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/LoadingItem.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotredesign/core/epoxy/LoadingItem.kt
rename to vector/src/main/java/im/vector/riotx/core/epoxy/LoadingItem.kt
index 2ee016efef..332025b5de 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/epoxy/LoadingItem.kt
+++ b/vector/src/main/java/im/vector/riotx/core/epoxy/LoadingItem.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.epoxy
+package im.vector.riotx.core.epoxy
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.extensions.setTextOrHide
+import im.vector.riotx.R
+import im.vector.riotx.core.extensions.setTextOrHide
 
 @EpoxyModelClass(layout = R.layout.item_loading)
 abstract class LoadingItem : VectorEpoxyModel<LoadingItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotredesign/core/epoxy/NoResultItem.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/NoResultItem.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/core/epoxy/NoResultItem.kt
rename to vector/src/main/java/im/vector/riotx/core/epoxy/NoResultItem.kt
index 036ed36bbf..d373d5c62e 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/epoxy/NoResultItem.kt
+++ b/vector/src/main/java/im/vector/riotx/core/epoxy/NoResultItem.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.epoxy
+package im.vector.riotx.core.epoxy
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 @EpoxyModelClass(layout = R.layout.item_no_result)
 abstract class NoResultItem : VectorEpoxyModel<NoResultItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotredesign/core/epoxy/VectorEpoxyHolder.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyHolder.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/core/epoxy/VectorEpoxyHolder.kt
rename to vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyHolder.kt
index 7c6f200bd2..e9d21977cd 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/epoxy/VectorEpoxyHolder.kt
+++ b/vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyHolder.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.epoxy
+package im.vector.riotx.core.epoxy
 
 import android.view.View
 import com.airbnb.epoxy.EpoxyHolder
diff --git a/vector/src/main/java/im/vector/riotredesign/core/epoxy/VectorEpoxyModel.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyModel.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/core/epoxy/VectorEpoxyModel.kt
rename to vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyModel.kt
index 16c2401dd9..83dce44dc7 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/epoxy/VectorEpoxyModel.kt
+++ b/vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.epoxy
+package im.vector.riotx.core.epoxy
 
 import com.airbnb.epoxy.EpoxyModelWithHolder
 import com.airbnb.epoxy.VisibilityState
diff --git a/vector/src/main/java/im/vector/riotredesign/core/error/ErrorFormatter.kt b/vector/src/main/java/im/vector/riotx/core/error/ErrorFormatter.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotredesign/core/error/ErrorFormatter.kt
rename to vector/src/main/java/im/vector/riotx/core/error/ErrorFormatter.kt
index 284bd19245..7619d433d7 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/error/ErrorFormatter.kt
+++ b/vector/src/main/java/im/vector/riotx/core/error/ErrorFormatter.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.error
+package im.vector.riotx.core.error
 
 import im.vector.matrix.android.api.failure.Failure
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.resources.StringProvider
+import im.vector.riotx.R
+import im.vector.riotx.core.resources.StringProvider
 import javax.inject.Inject
 
 class ErrorFormatter @Inject constructor(val stringProvider: StringProvider) {
diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/Activity.kt b/vector/src/main/java/im/vector/riotx/core/extensions/Activity.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/core/extensions/Activity.kt
rename to vector/src/main/java/im/vector/riotx/core/extensions/Activity.kt
index 78796d5e82..7581777924 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/extensions/Activity.kt
+++ b/vector/src/main/java/im/vector/riotx/core/extensions/Activity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/BasicExtensions.kt b/vector/src/main/java/im/vector/riotx/core/extensions/BasicExtensions.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotredesign/core/extensions/BasicExtensions.kt
rename to vector/src/main/java/im/vector/riotx/core/extensions/BasicExtensions.kt
index 50c9b4d474..4de2cc0023 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/extensions/BasicExtensions.kt
+++ b/vector/src/main/java/im/vector/riotx/core/extensions/BasicExtensions.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/Context.kt b/vector/src/main/java/im/vector/riotx/core/extensions/Context.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotredesign/core/extensions/Context.kt
rename to vector/src/main/java/im/vector/riotx/core/extensions/Context.kt
index f9b30a475e..e78acf09ab 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/extensions/Context.kt
+++ b/vector/src/main/java/im/vector/riotx/core/extensions/Context.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import android.content.Context
-import im.vector.riotredesign.core.di.HasVectorInjector
-import im.vector.riotredesign.core.di.VectorComponent
+import im.vector.riotx.core.di.HasVectorInjector
+import im.vector.riotx.core.di.VectorComponent
 
 fun Context.vectorComponent(): VectorComponent {
     val appContext = applicationContext
diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/EditText.kt b/vector/src/main/java/im/vector/riotx/core/extensions/EditText.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/core/extensions/EditText.kt
rename to vector/src/main/java/im/vector/riotx/core/extensions/EditText.kt
index e406902012..ecc7795a7b 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/extensions/EditText.kt
+++ b/vector/src/main/java/im/vector/riotx/core/extensions/EditText.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import android.text.Editable
 import android.text.InputType
@@ -23,7 +23,7 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.EditText
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 fun EditText.setupAsSearch() {
     addTextChangedListener(object : TextWatcher {
diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/Event.kt b/vector/src/main/java/im/vector/riotx/core/extensions/Event.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotredesign/core/extensions/Event.kt
rename to vector/src/main/java/im/vector/riotx/core/extensions/Event.kt
index d93877a6bd..e9c3703b19 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/extensions/Event.kt
+++ b/vector/src/main/java/im/vector/riotx/core/extensions/Event.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.riotredesign.core.resources.DateProvider
+import im.vector.riotx.core.resources.DateProvider
 import org.threeten.bp.LocalDateTime
 
 fun Event.localDateTime(): LocalDateTime {
diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/Fragment.kt b/vector/src/main/java/im/vector/riotx/core/extensions/Fragment.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/core/extensions/Fragment.kt
rename to vector/src/main/java/im/vector/riotx/core/extensions/Fragment.kt
index e0eb4bac15..65f8fb2aaa 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/extensions/Fragment.kt
+++ b/vector/src/main/java/im/vector/riotx/core/extensions/Fragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import androidx.fragment.app.Fragment
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/FragmentManager.kt b/vector/src/main/java/im/vector/riotx/core/extensions/FragmentManager.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/core/extensions/FragmentManager.kt
rename to vector/src/main/java/im/vector/riotx/core/extensions/FragmentManager.kt
index 9d0134e5bf..d7db53d79d 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/extensions/FragmentManager.kt
+++ b/vector/src/main/java/im/vector/riotx/core/extensions/FragmentManager.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import androidx.fragment.app.FragmentTransaction
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/Iterable.kt b/vector/src/main/java/im/vector/riotx/core/extensions/Iterable.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/core/extensions/Iterable.kt
rename to vector/src/main/java/im/vector/riotx/core/extensions/Iterable.kt
index 8a3d63fcf2..a69b0ed805 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/extensions/Iterable.kt
+++ b/vector/src/main/java/im/vector/riotx/core/extensions/Iterable.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 /**
  * Returns the last element yielding the smallest value of the given function or `null` if there are no elements.
diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/LiveData.kt b/vector/src/main/java/im/vector/riotx/core/extensions/LiveData.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotredesign/core/extensions/LiveData.kt
rename to vector/src/main/java/im/vector/riotx/core/extensions/LiveData.kt
index 2bd4016241..a6ab57fee8 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/extensions/LiveData.kt
+++ b/vector/src/main/java/im/vector/riotx/core/extensions/LiveData.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
-import im.vector.riotredesign.core.utils.Debouncer
-import im.vector.riotredesign.core.utils.EventObserver
-import im.vector.riotredesign.core.utils.LiveEvent
+import im.vector.riotx.core.utils.Debouncer
+import im.vector.riotx.core.utils.EventObserver
+import im.vector.riotx.core.utils.LiveEvent
 
 inline fun <T> LiveData<T>.observeK(owner: LifecycleOwner, crossinline observer: (T?) -> Unit) {
     this.observe(owner, Observer { observer(it) })
diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/Session.kt b/vector/src/main/java/im/vector/riotx/core/extensions/Session.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotredesign/core/extensions/Session.kt
rename to vector/src/main/java/im/vector/riotx/core/extensions/Session.kt
index 65987a2549..b03686d488 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/extensions/Session.kt
+++ b/vector/src/main/java/im/vector/riotx/core/extensions/Session.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.sync.FilterService
-import im.vector.riotredesign.features.notifications.PushRuleTriggerListener
+import im.vector.riotx.features.notifications.PushRuleTriggerListener
 
 fun Session.configureAndStart(pushRuleTriggerListener: PushRuleTriggerListener) {
     open()
diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/TextView.kt b/vector/src/main/java/im/vector/riotx/core/extensions/TextView.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/core/extensions/TextView.kt
rename to vector/src/main/java/im/vector/riotx/core/extensions/TextView.kt
index 0edcab462e..3bece712c0 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/extensions/TextView.kt
+++ b/vector/src/main/java/im/vector/riotx/core/extensions/TextView.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import android.text.Spannable
 import android.text.SpannableString
@@ -23,7 +23,7 @@ import android.widget.TextView
 import androidx.annotation.AttrRes
 import androidx.annotation.StringRes
 import androidx.core.view.isVisible
-import im.vector.riotredesign.features.themes.ThemeUtils
+import im.vector.riotx.features.themes.ThemeUtils
 
 
 /**
diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/UrlExtensions.kt b/vector/src/main/java/im/vector/riotx/core/extensions/UrlExtensions.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/core/extensions/UrlExtensions.kt
rename to vector/src/main/java/im/vector/riotx/core/extensions/UrlExtensions.kt
index e087c3fdb3..f9595e7989 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/extensions/UrlExtensions.kt
+++ b/vector/src/main/java/im/vector/riotx/core/extensions/UrlExtensions.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import java.net.URLEncoder
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/View.kt b/vector/src/main/java/im/vector/riotx/core/extensions/View.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/core/extensions/View.kt
rename to vector/src/main/java/im/vector/riotx/core/extensions/View.kt
index d8799b3a30..a5ce4d9f3d 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/extensions/View.kt
+++ b/vector/src/main/java/im/vector/riotx/core/extensions/View.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import android.content.Context
 import android.view.View
diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/ViewExtensions.kt b/vector/src/main/java/im/vector/riotx/core/extensions/ViewExtensions.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/core/extensions/ViewExtensions.kt
rename to vector/src/main/java/im/vector/riotx/core/extensions/ViewExtensions.kt
index 99af0a3854..c84f09927d 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/extensions/ViewExtensions.kt
+++ b/vector/src/main/java/im/vector/riotx/core/extensions/ViewExtensions.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import android.text.InputType
 import android.view.View
 import android.view.ViewGroup
 import android.widget.EditText
 import androidx.appcompat.widget.SearchView
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 /**
  * Remove left margin of a SearchView
diff --git a/vector/src/main/java/im/vector/riotredesign/core/files/FileSaver.kt b/vector/src/main/java/im/vector/riotx/core/files/FileSaver.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/core/files/FileSaver.kt
rename to vector/src/main/java/im/vector/riotx/core/files/FileSaver.kt
index faefe01421..23798587ca 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/files/FileSaver.kt
+++ b/vector/src/main/java/im/vector/riotx/core/files/FileSaver.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.files
+package im.vector.riotx.core.files
 
 import android.app.DownloadManager
 import android.content.Context
diff --git a/vector/src/main/java/im/vector/riotredesign/core/glide/ElementToDecryptOption.kt b/vector/src/main/java/im/vector/riotx/core/glide/ElementToDecryptOption.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/core/glide/ElementToDecryptOption.kt
rename to vector/src/main/java/im/vector/riotx/core/glide/ElementToDecryptOption.kt
index 7980502911..abab8aec30 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/glide/ElementToDecryptOption.kt
+++ b/vector/src/main/java/im/vector/riotx/core/glide/ElementToDecryptOption.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.glide
+package im.vector.riotx.core.glide
 
 import com.bumptech.glide.load.Option
 import im.vector.matrix.android.internal.crypto.attachments.ElementToDecrypt
diff --git a/vector/src/main/java/im/vector/riotredesign/core/glide/MyAppGlideModule.kt b/vector/src/main/java/im/vector/riotx/core/glide/MyAppGlideModule.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotredesign/core/glide/MyAppGlideModule.kt
rename to vector/src/main/java/im/vector/riotx/core/glide/MyAppGlideModule.kt
index 54d3104c20..09998347fc 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/glide/MyAppGlideModule.kt
+++ b/vector/src/main/java/im/vector/riotx/core/glide/MyAppGlideModule.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.glide
+package im.vector.riotx.core.glide
 
 import android.content.Context
 import android.util.Log
@@ -24,8 +24,8 @@ import com.bumptech.glide.GlideBuilder
 import com.bumptech.glide.Registry
 import com.bumptech.glide.annotation.GlideModule
 import com.bumptech.glide.module.AppGlideModule
-import im.vector.riotredesign.core.extensions.vectorComponent
-import im.vector.riotredesign.features.media.ImageContentRenderer
+import im.vector.riotx.core.extensions.vectorComponent
+import im.vector.riotx.features.media.ImageContentRenderer
 import java.io.InputStream
 
 @GlideModule
diff --git a/vector/src/main/java/im/vector/riotredesign/core/glide/VectorGlideModelLoader.kt b/vector/src/main/java/im/vector/riotx/core/glide/VectorGlideModelLoader.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/core/glide/VectorGlideModelLoader.kt
rename to vector/src/main/java/im/vector/riotx/core/glide/VectorGlideModelLoader.kt
index dd62cedc49..e2a3f3fdd0 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/glide/VectorGlideModelLoader.kt
+++ b/vector/src/main/java/im/vector/riotx/core/glide/VectorGlideModelLoader.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.glide
+package im.vector.riotx.core.glide
 
 import com.bumptech.glide.Priority
 import com.bumptech.glide.load.DataSource
@@ -25,8 +25,8 @@ import com.bumptech.glide.load.model.ModelLoaderFactory
 import com.bumptech.glide.load.model.MultiModelLoaderFactory
 import com.bumptech.glide.signature.ObjectKey
 import im.vector.matrix.android.internal.crypto.attachments.MXEncryptedAttachments
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.features.media.ImageContentRenderer
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.features.media.ImageContentRenderer
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import timber.log.Timber
diff --git a/vector/src/main/java/im/vector/riotredesign/core/intent/ExternalIntentAnalyser.kt b/vector/src/main/java/im/vector/riotx/core/intent/ExternalIntentAnalyser.kt
similarity index 99%
rename from vector/src/main/java/im/vector/riotredesign/core/intent/ExternalIntentAnalyser.kt
rename to vector/src/main/java/im/vector/riotx/core/intent/ExternalIntentAnalyser.kt
index 916662e320..b9bade2a11 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/intent/ExternalIntentAnalyser.kt
+++ b/vector/src/main/java/im/vector/riotx/core/intent/ExternalIntentAnalyser.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.intent
+package im.vector.riotx.core.intent
 
 import android.content.ClipData
 import android.content.ClipDescription
diff --git a/vector/src/main/java/im/vector/riotredesign/core/intent/Filename.kt b/vector/src/main/java/im/vector/riotx/core/intent/Filename.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/core/intent/Filename.kt
rename to vector/src/main/java/im/vector/riotx/core/intent/Filename.kt
index 78a0471604..2b8421f6f0 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/intent/Filename.kt
+++ b/vector/src/main/java/im/vector/riotx/core/intent/Filename.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.intent
+package im.vector.riotx.core.intent
 
 import android.content.Context
 import android.database.Cursor
diff --git a/vector/src/main/java/im/vector/riotredesign/core/intent/VectorMimeType.kt b/vector/src/main/java/im/vector/riotx/core/intent/VectorMimeType.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/core/intent/VectorMimeType.kt
rename to vector/src/main/java/im/vector/riotx/core/intent/VectorMimeType.kt
index b801d2c290..110a89cce9 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/intent/VectorMimeType.kt
+++ b/vector/src/main/java/im/vector/riotx/core/intent/VectorMimeType.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.intent
+package im.vector.riotx.core.intent
 
 import android.content.Context
 import android.net.Uri
 import android.webkit.MimeTypeMap
-import im.vector.riotredesign.core.utils.getFileExtension
+import im.vector.riotx.core.utils.getFileExtension
 import timber.log.Timber
 
 /**
diff --git a/vector/src/main/java/im/vector/riotredesign/core/linkify/VectorAutoLinkPatterns.kt b/vector/src/main/java/im/vector/riotx/core/linkify/VectorAutoLinkPatterns.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/core/linkify/VectorAutoLinkPatterns.kt
rename to vector/src/main/java/im/vector/riotx/core/linkify/VectorAutoLinkPatterns.kt
index af200a3f31..ff083d4b94 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/linkify/VectorAutoLinkPatterns.kt
+++ b/vector/src/main/java/im/vector/riotx/core/linkify/VectorAutoLinkPatterns.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.core.linkify
+package im.vector.riotx.core.linkify
 
 import java.util.regex.Pattern
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/linkify/VectorLinkify.kt b/vector/src/main/java/im/vector/riotx/core/linkify/VectorLinkify.kt
similarity index 99%
rename from vector/src/main/java/im/vector/riotredesign/core/linkify/VectorLinkify.kt
rename to vector/src/main/java/im/vector/riotx/core/linkify/VectorLinkify.kt
index 243c069cd3..8ff885eb8a 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/linkify/VectorLinkify.kt
+++ b/vector/src/main/java/im/vector/riotx/core/linkify/VectorLinkify.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.core.linkify
+package im.vector.riotx.core.linkify
 
 import android.text.Spannable
 import android.text.style.URLSpan
diff --git a/vector/src/main/java/im/vector/riotredesign/core/mvrx/NavigationViewModel.kt b/vector/src/main/java/im/vector/riotx/core/mvrx/NavigationViewModel.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotredesign/core/mvrx/NavigationViewModel.kt
rename to vector/src/main/java/im/vector/riotx/core/mvrx/NavigationViewModel.kt
index 87b09c37ed..ab3ce7c82d 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/mvrx/NavigationViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/core/mvrx/NavigationViewModel.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.mvrx
+package im.vector.riotx.core.mvrx
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import im.vector.riotredesign.core.utils.LiveEvent
+import im.vector.riotx.core.utils.LiveEvent
 
 abstract class NavigationViewModel<NavigationClass> : ViewModel() {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/ButtonStateView.kt b/vector/src/main/java/im/vector/riotx/core/platform/ButtonStateView.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/core/platform/ButtonStateView.kt
rename to vector/src/main/java/im/vector/riotx/core/platform/ButtonStateView.kt
index f9aaf0d05d..9753b26691 100755
--- a/vector/src/main/java/im/vector/riotredesign/core/platform/ButtonStateView.kt
+++ b/vector/src/main/java/im/vector/riotx/core/platform/ButtonStateView.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.platform
+package im.vector.riotx.core.platform
 
 import android.content.Context
 import android.util.AttributeSet
@@ -24,7 +24,7 @@ import android.widget.Button
 import android.widget.FrameLayout
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 import kotlinx.android.synthetic.main.view_button_state.view.*
 
 class ButtonStateView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0)
diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/CheckableConstraintLayout.kt b/vector/src/main/java/im/vector/riotx/core/platform/CheckableConstraintLayout.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/core/platform/CheckableConstraintLayout.kt
rename to vector/src/main/java/im/vector/riotx/core/platform/CheckableConstraintLayout.kt
index 3ecc707d4d..72ccf99792 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/platform/CheckableConstraintLayout.kt
+++ b/vector/src/main/java/im/vector/riotx/core/platform/CheckableConstraintLayout.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.platform
+package im.vector.riotx.core.platform
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/CheckableFrameLayout.kt b/vector/src/main/java/im/vector/riotx/core/platform/CheckableFrameLayout.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/core/platform/CheckableFrameLayout.kt
rename to vector/src/main/java/im/vector/riotx/core/platform/CheckableFrameLayout.kt
index efc56fd2ae..1c0329b964 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/platform/CheckableFrameLayout.kt
+++ b/vector/src/main/java/im/vector/riotx/core/platform/CheckableFrameLayout.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.platform
+package im.vector.riotx.core.platform
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/CheckableView.kt b/vector/src/main/java/im/vector/riotx/core/platform/CheckableView.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/core/platform/CheckableView.kt
rename to vector/src/main/java/im/vector/riotx/core/platform/CheckableView.kt
index a590dda5d6..0f81f7e4ff 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/platform/CheckableView.kt
+++ b/vector/src/main/java/im/vector/riotx/core/platform/CheckableView.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.platform
+package im.vector.riotx.core.platform
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/ConfigurationViewModel.kt b/vector/src/main/java/im/vector/riotx/core/platform/ConfigurationViewModel.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotredesign/core/platform/ConfigurationViewModel.kt
rename to vector/src/main/java/im/vector/riotx/core/platform/ConfigurationViewModel.kt
index 24fa889b45..bb2db5cbb5 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/platform/ConfigurationViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/core/platform/ConfigurationViewModel.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.platform
+package im.vector.riotx.core.platform
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import im.vector.riotredesign.core.utils.LiveEvent
-import im.vector.riotredesign.features.configuration.VectorConfiguration
+import im.vector.riotx.core.utils.LiveEvent
+import im.vector.riotx.features.configuration.VectorConfiguration
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/DefaultListUpdateCallback.kt b/vector/src/main/java/im/vector/riotx/core/platform/DefaultListUpdateCallback.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/core/platform/DefaultListUpdateCallback.kt
rename to vector/src/main/java/im/vector/riotx/core/platform/DefaultListUpdateCallback.kt
index c5a4be9208..c61cd1082f 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/platform/DefaultListUpdateCallback.kt
+++ b/vector/src/main/java/im/vector/riotx/core/platform/DefaultListUpdateCallback.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.platform
+package im.vector.riotx.core.platform
 
 import androidx.recyclerview.widget.ListUpdateCallback
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/OnBackPressed.kt b/vector/src/main/java/im/vector/riotx/core/platform/OnBackPressed.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/core/platform/OnBackPressed.kt
rename to vector/src/main/java/im/vector/riotx/core/platform/OnBackPressed.kt
index 46f51be793..1226ed3e90 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/platform/OnBackPressed.kt
+++ b/vector/src/main/java/im/vector/riotx/core/platform/OnBackPressed.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.platform
+package im.vector.riotx.core.platform
 
 interface OnBackPressed {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/Restorable.kt b/vector/src/main/java/im/vector/riotx/core/platform/Restorable.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/core/platform/Restorable.kt
rename to vector/src/main/java/im/vector/riotx/core/platform/Restorable.kt
index 683fed732f..3d720f6951 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/platform/Restorable.kt
+++ b/vector/src/main/java/im/vector/riotx/core/platform/Restorable.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.platform
+package im.vector.riotx.core.platform
 
 import android.os.Bundle
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/SimpleFragmentActivity.kt b/vector/src/main/java/im/vector/riotx/core/platform/SimpleFragmentActivity.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/core/platform/SimpleFragmentActivity.kt
rename to vector/src/main/java/im/vector/riotx/core/platform/SimpleFragmentActivity.kt
index b02b2cb809..546937da59 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/platform/SimpleFragmentActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/core/platform/SimpleFragmentActivity.kt
@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.core.platform
+package im.vector.riotx.core.platform
 
-import android.os.Bundle
 import android.view.View
 import android.widget.ProgressBar
 import android.widget.TextView
@@ -23,9 +22,9 @@ import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import butterknife.BindView
 import im.vector.matrix.android.api.session.Session
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.extensions.hideKeyboard
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.extensions.hideKeyboard
 import kotlinx.android.synthetic.main.activity.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/SimpleTextWatcher.kt b/vector/src/main/java/im/vector/riotx/core/platform/SimpleTextWatcher.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/core/platform/SimpleTextWatcher.kt
rename to vector/src/main/java/im/vector/riotx/core/platform/SimpleTextWatcher.kt
index d222954252..e54a6d29f2 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/platform/SimpleTextWatcher.kt
+++ b/vector/src/main/java/im/vector/riotx/core/platform/SimpleTextWatcher.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.platform
+package im.vector.riotx.core.platform
 
 import android.text.Editable
 import android.text.TextWatcher
diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/StateView.kt b/vector/src/main/java/im/vector/riotx/core/platform/StateView.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/core/platform/StateView.kt
rename to vector/src/main/java/im/vector/riotx/core/platform/StateView.kt
index cdffd22cc8..c818f709e9 100755
--- a/vector/src/main/java/im/vector/riotredesign/core/platform/StateView.kt
+++ b/vector/src/main/java/im/vector/riotx/core/platform/StateView.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.platform
+package im.vector.riotx.core.platform
 
 import android.content.Context
 import android.graphics.drawable.Drawable
 import android.util.AttributeSet
 import android.view.View
 import android.widget.FrameLayout
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 import kotlinx.android.synthetic.main.view_state.view.*
 
 class StateView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0)
diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/ToolbarConfigurable.kt b/vector/src/main/java/im/vector/riotx/core/platform/ToolbarConfigurable.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/core/platform/ToolbarConfigurable.kt
rename to vector/src/main/java/im/vector/riotx/core/platform/ToolbarConfigurable.kt
index 2b4172428d..dc35662083 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/platform/ToolbarConfigurable.kt
+++ b/vector/src/main/java/im/vector/riotx/core/platform/ToolbarConfigurable.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.platform
+package im.vector.riotx.core.platform
 
 import androidx.appcompat.widget.Toolbar
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseActivity.kt
rename to vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt
index d07c26324f..74bff9e5da 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.platform
+package im.vector.riotx.core.platform
 
 import android.content.Context
 import android.content.res.Configuration
@@ -40,17 +40,17 @@ import butterknife.Unbinder
 import com.airbnb.mvrx.BaseMvRxActivity
 import com.bumptech.glide.util.Util
 import com.google.android.material.snackbar.Snackbar
-import im.vector.riotredesign.BuildConfig
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.*
-import im.vector.riotredesign.core.utils.toast
-import im.vector.riotredesign.features.configuration.VectorConfiguration
-import im.vector.riotredesign.features.rageshake.BugReportActivity
-import im.vector.riotredesign.features.rageshake.BugReporter
-import im.vector.riotredesign.features.rageshake.RageShake
-import im.vector.riotredesign.features.themes.ActivityOtherThemes
-import im.vector.riotredesign.features.themes.ThemeUtils
-import im.vector.riotredesign.receivers.DebugReceiver
+import im.vector.riotx.BuildConfig
+import im.vector.riotx.R
+import im.vector.riotx.core.di.*
+import im.vector.riotx.core.utils.toast
+import im.vector.riotx.features.configuration.VectorConfiguration
+import im.vector.riotx.features.rageshake.BugReportActivity
+import im.vector.riotx.features.rageshake.BugReporter
+import im.vector.riotx.features.rageshake.RageShake
+import im.vector.riotx.features.themes.ActivityOtherThemes
+import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.riotx.receivers.DebugReceiver
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
 import timber.log.Timber
diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseFragment.kt b/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseFragment.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseFragment.kt
rename to vector/src/main/java/im/vector/riotx/core/platform/VectorBaseFragment.kt
index 39b267416a..ec5e419dee 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.platform
+package im.vector.riotx.core.platform
 
 import android.content.Context
 import android.os.Bundle
@@ -34,10 +34,10 @@ import butterknife.Unbinder
 import com.airbnb.mvrx.BaseMvRxFragment
 import com.airbnb.mvrx.MvRx
 import com.bumptech.glide.util.Util.assertMainThread
-import im.vector.riotredesign.core.di.DaggerScreenComponent
-import im.vector.riotredesign.core.di.HasScreenInjector
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.features.navigation.Navigator
+import im.vector.riotx.core.di.DaggerScreenComponent
+import im.vector.riotx.core.di.HasScreenInjector
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.features.navigation.Navigator
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
 import timber.log.Timber
diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/VectorPreferenceFragment.kt b/vector/src/main/java/im/vector/riotx/core/platform/VectorPreferenceFragment.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/core/platform/VectorPreferenceFragment.kt
rename to vector/src/main/java/im/vector/riotx/core/platform/VectorPreferenceFragment.kt
index ddd908090b..b543a98323 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/platform/VectorPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/core/platform/VectorPreferenceFragment.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.platform
+package im.vector.riotx.core.platform
 
 import androidx.annotation.CallSuper
 import androidx.preference.PreferenceFragmentCompat
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.utils.toast
+import im.vector.riotx.R
+import im.vector.riotx.core.utils.toast
 import timber.log.Timber
 
 abstract class VectorPreferenceFragment : PreferenceFragmentCompat() {
diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/VectorViewModel.kt b/vector/src/main/java/im/vector/riotx/core/platform/VectorViewModel.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotredesign/core/platform/VectorViewModel.kt
rename to vector/src/main/java/im/vector/riotx/core/platform/VectorViewModel.kt
index a74ab33cd4..0bd823d271 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/platform/VectorViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/core/platform/VectorViewModel.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.platform
+package im.vector.riotx.core.platform
 
 import com.airbnb.mvrx.BaseMvRxViewModel
 import com.airbnb.mvrx.MvRxState
-import im.vector.riotredesign.BuildConfig
+import im.vector.riotx.BuildConfig
 
 abstract class VectorViewModel<S : MvRxState>(initialState: S)
     : BaseMvRxViewModel<S>(initialState, debugMode = BuildConfig.DEBUG)
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/WaitingViewData.kt b/vector/src/main/java/im/vector/riotx/core/platform/WaitingViewData.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/core/platform/WaitingViewData.kt
rename to vector/src/main/java/im/vector/riotx/core/platform/WaitingViewData.kt
index 0019100795..9a079a6c38 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/platform/WaitingViewData.kt
+++ b/vector/src/main/java/im/vector/riotx/core/platform/WaitingViewData.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.platform
+package im.vector.riotx.core.platform
 
 /**
  * Model to display a Waiting View
diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/AddressPreference.kt b/vector/src/main/java/im/vector/riotx/core/preference/AddressPreference.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/core/preference/AddressPreference.kt
rename to vector/src/main/java/im/vector/riotx/core/preference/AddressPreference.kt
index e3fb1a079c..2516bbfade 100755
--- a/vector/src/main/java/im/vector/riotredesign/core/preference/AddressPreference.kt
+++ b/vector/src/main/java/im/vector/riotx/core/preference/AddressPreference.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.preference
+package im.vector.riotx.core.preference
 
 import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import android.widget.ImageView
 import androidx.preference.PreferenceViewHolder
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 /**
  * Preference used in Room setting for Room aliases
diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/BingRulePreference.kt b/vector/src/main/java/im/vector/riotx/core/preference/BingRulePreference.kt
similarity index 99%
rename from vector/src/main/java/im/vector/riotredesign/core/preference/BingRulePreference.kt
rename to vector/src/main/java/im/vector/riotx/core/preference/BingRulePreference.kt
index 9a17390bb9..a047816905 100755
--- a/vector/src/main/java/im/vector/riotredesign/core/preference/BingRulePreference.kt
+++ b/vector/src/main/java/im/vector/riotx/core/preference/BingRulePreference.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.preference
+package im.vector.riotx.core.preference
 
 import android.content.Context
 import android.text.TextUtils
@@ -23,7 +23,7 @@ import android.view.View
 import android.widget.RadioGroup
 import android.widget.TextView
 import androidx.preference.PreferenceViewHolder
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 // TODO Replace by real Bingrule class, then delete
 class BingRule(rule: BingRule) {
diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/ProgressBarPreference.kt b/vector/src/main/java/im/vector/riotx/core/preference/ProgressBarPreference.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/core/preference/ProgressBarPreference.kt
rename to vector/src/main/java/im/vector/riotx/core/preference/ProgressBarPreference.kt
index de36106c28..fe79afe325 100755
--- a/vector/src/main/java/im/vector/riotredesign/core/preference/ProgressBarPreference.kt
+++ b/vector/src/main/java/im/vector/riotx/core/preference/ProgressBarPreference.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.preference
+package im.vector.riotx.core.preference
 
 import android.content.Context
 import android.util.AttributeSet
 import androidx.preference.Preference
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 class ProgressBarPreference : Preference {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/RoomAvatarPreference.kt b/vector/src/main/java/im/vector/riotx/core/preference/RoomAvatarPreference.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/core/preference/RoomAvatarPreference.kt
rename to vector/src/main/java/im/vector/riotx/core/preference/RoomAvatarPreference.kt
index ca17794eb8..c0e4dfabf2 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/preference/RoomAvatarPreference.kt
+++ b/vector/src/main/java/im/vector/riotx/core/preference/RoomAvatarPreference.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.preference
+package im.vector.riotx.core.preference
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/UserAvatarPreference.kt b/vector/src/main/java/im/vector/riotx/core/preference/UserAvatarPreference.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotredesign/core/preference/UserAvatarPreference.kt
rename to vector/src/main/java/im/vector/riotx/core/preference/UserAvatarPreference.kt
index 4acd826575..e5e8451450 100755
--- a/vector/src/main/java/im/vector/riotredesign/core/preference/UserAvatarPreference.kt
+++ b/vector/src/main/java/im/vector/riotx/core/preference/UserAvatarPreference.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.preference
+package im.vector.riotx.core.preference
 
 import android.content.Context
 import android.util.AttributeSet
@@ -23,9 +23,9 @@ import android.widget.ProgressBar
 import androidx.preference.Preference
 import androidx.preference.PreferenceViewHolder
 import im.vector.matrix.android.api.session.Session
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.extensions.vectorComponent
-import im.vector.riotredesign.features.home.AvatarRenderer
+import im.vector.riotx.R
+import im.vector.riotx.core.extensions.vectorComponent
+import im.vector.riotx.features.home.AvatarRenderer
 
 open class UserAvatarPreference : Preference {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorEditTextPreference.kt b/vector/src/main/java/im/vector/riotx/core/preference/VectorEditTextPreference.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/core/preference/VectorEditTextPreference.kt
rename to vector/src/main/java/im/vector/riotx/core/preference/VectorEditTextPreference.kt
index 2d7453eff5..1d1e1936c5 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorEditTextPreference.kt
+++ b/vector/src/main/java/im/vector/riotx/core/preference/VectorEditTextPreference.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.preference
+package im.vector.riotx.core.preference
 
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.TextView
 import androidx.preference.EditTextPreference
 import androidx.preference.PreferenceViewHolder
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 import timber.log.Timber
 
 /**
diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorGroupPreference.kt b/vector/src/main/java/im/vector/riotx/core/preference/VectorGroupPreference.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/core/preference/VectorGroupPreference.kt
rename to vector/src/main/java/im/vector/riotx/core/preference/VectorGroupPreference.kt
index 1189b99e7a..779903a8fd 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorGroupPreference.kt
+++ b/vector/src/main/java/im/vector/riotx/core/preference/VectorGroupPreference.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.preference
+package im.vector.riotx.core.preference
 
 import android.content.Context
 import android.util.AttributeSet
@@ -28,7 +28,7 @@ import androidx.preference.PreferenceViewHolder
 import androidx.preference.SwitchPreference
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.group.Group
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 class VectorGroupPreference : SwitchPreference {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorListPreference.kt b/vector/src/main/java/im/vector/riotx/core/preference/VectorListPreference.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/core/preference/VectorListPreference.kt
rename to vector/src/main/java/im/vector/riotx/core/preference/VectorListPreference.kt
index 2eced2500d..2e52a1b9de 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorListPreference.kt
+++ b/vector/src/main/java/im/vector/riotx/core/preference/VectorListPreference.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.preference
+package im.vector.riotx.core.preference
 
 import android.content.Context
 import android.util.AttributeSet
@@ -22,7 +22,7 @@ import android.view.View
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceViewHolder
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 /**
  * Customize ListPreference class to add a warning icon to the right side of the list.
diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorPreference.kt b/vector/src/main/java/im/vector/riotx/core/preference/VectorPreference.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/core/preference/VectorPreference.kt
rename to vector/src/main/java/im/vector/riotx/core/preference/VectorPreference.kt
index 0bd5e7dbef..2654bc291c 100755
--- a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorPreference.kt
+++ b/vector/src/main/java/im/vector/riotx/core/preference/VectorPreference.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.preference
+package im.vector.riotx.core.preference
 
 import android.animation.Animator
 import android.animation.ArgbEvaluator
@@ -28,8 +28,8 @@ import android.widget.TextView
 import androidx.core.animation.doOnEnd
 import androidx.preference.Preference
 import androidx.preference.PreferenceViewHolder
-import im.vector.riotredesign.R
-import im.vector.riotredesign.features.themes.ThemeUtils
+import im.vector.riotx.R
+import im.vector.riotx.features.themes.ThemeUtils
 import timber.log.Timber
 
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorPreferenceCategory.kt b/vector/src/main/java/im/vector/riotx/core/preference/VectorPreferenceCategory.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/core/preference/VectorPreferenceCategory.kt
rename to vector/src/main/java/im/vector/riotx/core/preference/VectorPreferenceCategory.kt
index 0b0b501649..4c4ca7dd13 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorPreferenceCategory.kt
+++ b/vector/src/main/java/im/vector/riotx/core/preference/VectorPreferenceCategory.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.preference
+package im.vector.riotx.core.preference
 
 import android.content.Context
 import android.graphics.Typeface
diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorPreferenceDivider.kt b/vector/src/main/java/im/vector/riotx/core/preference/VectorPreferenceDivider.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/core/preference/VectorPreferenceDivider.kt
rename to vector/src/main/java/im/vector/riotx/core/preference/VectorPreferenceDivider.kt
index 7cb1ec4cdf..83ff88ba7a 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorPreferenceDivider.kt
+++ b/vector/src/main/java/im/vector/riotx/core/preference/VectorPreferenceDivider.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.preference
+package im.vector.riotx.core.preference
 
 import android.content.Context
 import android.util.AttributeSet
 import androidx.preference.Preference
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 /**
  * Divider for Preference screen
diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorSwitchPreference.kt b/vector/src/main/java/im/vector/riotx/core/preference/VectorSwitchPreference.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/core/preference/VectorSwitchPreference.kt
rename to vector/src/main/java/im/vector/riotx/core/preference/VectorSwitchPreference.kt
index 7693480c13..e6292d102b 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorSwitchPreference.kt
+++ b/vector/src/main/java/im/vector/riotx/core/preference/VectorSwitchPreference.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.preference
+package im.vector.riotx.core.preference
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/vector/src/main/java/im/vector/riotredesign/core/pushers/PushersManager.kt b/vector/src/main/java/im/vector/riotx/core/pushers/PushersManager.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotredesign/core/pushers/PushersManager.kt
rename to vector/src/main/java/im/vector/riotx/core/pushers/PushersManager.kt
index 94e517d3e7..482adc0f19 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/pushers/PushersManager.kt
+++ b/vector/src/main/java/im/vector/riotx/core/pushers/PushersManager.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.pushers
+package im.vector.riotx.core.pushers
 
 import im.vector.matrix.android.api.MatrixCallback
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.core.resources.AppNameProvider
-import im.vector.riotredesign.core.resources.LocaleProvider
-import im.vector.riotredesign.core.resources.StringProvider
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.core.resources.AppNameProvider
+import im.vector.riotx.core.resources.LocaleProvider
+import im.vector.riotx.core.resources.StringProvider
 import java.util.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/resources/AppNameProvider.kt b/vector/src/main/java/im/vector/riotx/core/resources/AppNameProvider.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/core/resources/AppNameProvider.kt
rename to vector/src/main/java/im/vector/riotx/core/resources/AppNameProvider.kt
index 355d175e19..9927a0eccc 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/resources/AppNameProvider.kt
+++ b/vector/src/main/java/im/vector/riotx/core/resources/AppNameProvider.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.resources
+package im.vector.riotx.core.resources
 
 import android.content.Context
 import timber.log.Timber
diff --git a/vector/src/main/java/im/vector/riotredesign/core/resources/ColorProvider.kt b/vector/src/main/java/im/vector/riotx/core/resources/ColorProvider.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotredesign/core/resources/ColorProvider.kt
rename to vector/src/main/java/im/vector/riotx/core/resources/ColorProvider.kt
index fc82265c0f..8930557dcd 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/resources/ColorProvider.kt
+++ b/vector/src/main/java/im/vector/riotx/core/resources/ColorProvider.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.resources
+package im.vector.riotx.core.resources
 
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
 import androidx.annotation.ColorRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
-import im.vector.riotredesign.features.themes.ThemeUtils
+import im.vector.riotx.features.themes.ThemeUtils
 import javax.inject.Inject
 
 class ColorProvider @Inject constructor(private val context: AppCompatActivity) {
diff --git a/vector/src/main/java/im/vector/riotredesign/core/resources/DateProvider.kt b/vector/src/main/java/im/vector/riotx/core/resources/DateProvider.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/core/resources/DateProvider.kt
rename to vector/src/main/java/im/vector/riotx/core/resources/DateProvider.kt
index 8c485b1b73..726dd39a0b 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/resources/DateProvider.kt
+++ b/vector/src/main/java/im/vector/riotx/core/resources/DateProvider.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.resources
+package im.vector.riotx.core.resources
 
 import org.threeten.bp.Instant
 import org.threeten.bp.LocalDateTime
diff --git a/vector/src/main/java/im/vector/riotredesign/core/resources/LocaleProvider.kt b/vector/src/main/java/im/vector/riotx/core/resources/LocaleProvider.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/core/resources/LocaleProvider.kt
rename to vector/src/main/java/im/vector/riotx/core/resources/LocaleProvider.kt
index 17df3d960f..ad44884a1d 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/resources/LocaleProvider.kt
+++ b/vector/src/main/java/im/vector/riotx/core/resources/LocaleProvider.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.resources
+package im.vector.riotx.core.resources
 
 import android.content.res.Resources
 import androidx.core.os.ConfigurationCompat
diff --git a/vector/src/main/java/im/vector/riotredesign/core/resources/ResourceUtils.kt b/vector/src/main/java/im/vector/riotx/core/resources/ResourceUtils.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/core/resources/ResourceUtils.kt
rename to vector/src/main/java/im/vector/riotx/core/resources/ResourceUtils.kt
index 1f1fbd9b4b..d841700dfe 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/resources/ResourceUtils.kt
+++ b/vector/src/main/java/im/vector/riotx/core/resources/ResourceUtils.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.resources
+package im.vector.riotx.core.resources
 
 import android.content.Context
 import android.net.Uri
 import android.text.TextUtils
 import android.webkit.MimeTypeMap
-import im.vector.riotredesign.core.utils.getFileExtension
+import im.vector.riotx.core.utils.getFileExtension
 import timber.log.Timber
 import java.io.InputStream
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/resources/StringArrayProvider.kt b/vector/src/main/java/im/vector/riotx/core/resources/StringArrayProvider.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/core/resources/StringArrayProvider.kt
rename to vector/src/main/java/im/vector/riotx/core/resources/StringArrayProvider.kt
index fe058ca354..4373143d59 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/resources/StringArrayProvider.kt
+++ b/vector/src/main/java/im/vector/riotx/core/resources/StringArrayProvider.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.resources
+package im.vector.riotx.core.resources
 
 import android.content.res.Resources
 import androidx.annotation.ArrayRes
diff --git a/vector/src/main/java/im/vector/riotredesign/core/resources/StringProvider.kt b/vector/src/main/java/im/vector/riotx/core/resources/StringProvider.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/core/resources/StringProvider.kt
rename to vector/src/main/java/im/vector/riotx/core/resources/StringProvider.kt
index f575f354e5..6c67458755 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/resources/StringProvider.kt
+++ b/vector/src/main/java/im/vector/riotx/core/resources/StringProvider.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.resources
+package im.vector.riotx.core.resources
 
 import android.content.res.Resources
 import androidx.annotation.NonNull
diff --git a/vector/src/main/java/im/vector/riotredesign/core/resources/UserPreferencesProvider.kt b/vector/src/main/java/im/vector/riotx/core/resources/UserPreferencesProvider.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotredesign/core/resources/UserPreferencesProvider.kt
rename to vector/src/main/java/im/vector/riotx/core/resources/UserPreferencesProvider.kt
index 05a4fc1bc2..ddbe1536b8 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/resources/UserPreferencesProvider.kt
+++ b/vector/src/main/java/im/vector/riotx/core/resources/UserPreferencesProvider.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.resources
+package im.vector.riotx.core.resources
 
 import android.content.Context
-import im.vector.riotredesign.features.settings.PreferencesManager
+import im.vector.riotx.features.settings.PreferencesManager
 import javax.inject.Inject
 
 class UserPreferencesProvider @Inject constructor(private val context: Context) {
diff --git a/vector/src/main/java/im/vector/riotredesign/core/services/CallService.kt b/vector/src/main/java/im/vector/riotx/core/services/CallService.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/core/services/CallService.kt
rename to vector/src/main/java/im/vector/riotx/core/services/CallService.kt
index 88d99a5cd8..92e9e40a55 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/services/CallService.kt
+++ b/vector/src/main/java/im/vector/riotx/core/services/CallService.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.services
+package im.vector.riotx.core.services
 
 import android.content.Context
 import android.content.Intent
 import androidx.core.content.ContextCompat
-import im.vector.riotredesign.features.notifications.NotificationUtils
+import im.vector.riotx.features.notifications.NotificationUtils
 import timber.log.Timber
 
 /**
@@ -147,9 +147,9 @@ class CallService : VectorService() {
     companion object {
         private const val NOTIFICATION_ID = 6480
 
-        private const val ACTION_INCOMING_CALL = "im.vector.riotredesign.core.services.CallService.INCOMING_CALL"
-        private const val ACTION_PENDING_CALL = "im.vector.riotredesign.core.services.CallService.PENDING_CALL"
-        private const val ACTION_NO_ACTIVE_CALL = "im.vector.riotredesign.core.services.CallService.NO_ACTIVE_CALL"
+        private const val ACTION_INCOMING_CALL = "im.vector.riotx.core.services.CallService.INCOMING_CALL"
+        private const val ACTION_PENDING_CALL = "im.vector.riotx.core.services.CallService.PENDING_CALL"
+        private const val ACTION_NO_ACTIVE_CALL = "im.vector.riotx.core.services.CallService.NO_ACTIVE_CALL"
 
         private const val EXTRA_IS_VIDEO = "EXTRA_IS_VIDEO"
         private const val EXTRA_ROOM_NAME = "EXTRA_ROOM_NAME"
diff --git a/vector/src/main/java/im/vector/riotredesign/core/services/VectorService.kt b/vector/src/main/java/im/vector/riotx/core/services/VectorService.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/core/services/VectorService.kt
rename to vector/src/main/java/im/vector/riotx/core/services/VectorService.kt
index 4b4c500d01..abf77f06cc 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/services/VectorService.kt
+++ b/vector/src/main/java/im/vector/riotx/core/services/VectorService.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.services
+package im.vector.riotx.core.services
 
 import android.app.Service
 import android.content.Intent
diff --git a/vector/src/main/java/im/vector/riotredesign/core/ui/list/GenericFooterItem.kt b/vector/src/main/java/im/vector/riotx/core/ui/list/GenericFooterItem.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotredesign/core/ui/list/GenericFooterItem.kt
rename to vector/src/main/java/im/vector/riotx/core/ui/list/GenericFooterItem.kt
index 30cd69a4cd..b171fb503b 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/ui/list/GenericFooterItem.kt
+++ b/vector/src/main/java/im/vector/riotx/core/ui/list/GenericFooterItem.kt
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.core.ui.list
+package im.vector.riotx.core.ui.list
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder
-import im.vector.riotredesign.core.epoxy.VectorEpoxyModel
-import im.vector.riotredesign.core.extensions.setTextOrHide
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.riotx.core.extensions.setTextOrHide
 
 /**
  * A generic list item.
diff --git a/vector/src/main/java/im/vector/riotredesign/core/ui/list/GenericItem.kt b/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItem.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/core/ui/list/GenericItem.kt
rename to vector/src/main/java/im/vector/riotx/core/ui/list/GenericItem.kt
index 2f223294d0..ebaeb2d39e 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/ui/list/GenericItem.kt
+++ b/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItem.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.core.ui.list
+package im.vector.riotx.core.ui.list
 
 import android.view.View
 import android.widget.Button
@@ -24,10 +24,10 @@ import androidx.annotation.DrawableRes
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder
-import im.vector.riotredesign.core.epoxy.VectorEpoxyModel
-import im.vector.riotredesign.core.extensions.setTextOrHide
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.riotx.core.extensions.setTextOrHide
 
 /**
  * A generic list item.
diff --git a/vector/src/main/java/im/vector/riotredesign/core/ui/views/KeysBackupBanner.kt b/vector/src/main/java/im/vector/riotx/core/ui/views/KeysBackupBanner.kt
similarity index 99%
rename from vector/src/main/java/im/vector/riotredesign/core/ui/views/KeysBackupBanner.kt
rename to vector/src/main/java/im/vector/riotx/core/ui/views/KeysBackupBanner.kt
index 98b24211d6..1f35ca25e0 100755
--- a/vector/src/main/java/im/vector/riotredesign/core/ui/views/KeysBackupBanner.kt
+++ b/vector/src/main/java/im/vector/riotx/core/ui/views/KeysBackupBanner.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.ui.views
+package im.vector.riotx.core.ui.views
 
 import android.content.Context
 import android.preference.PreferenceManager
@@ -30,7 +30,7 @@ import androidx.transition.TransitionManager
 import butterknife.BindView
 import butterknife.ButterKnife
 import butterknife.OnClick
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 import timber.log.Timber
 
 /**
diff --git a/vector/src/main/java/im/vector/riotredesign/core/ui/views/PasswordStrengthBar.kt b/vector/src/main/java/im/vector/riotx/core/ui/views/PasswordStrengthBar.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/core/ui/views/PasswordStrengthBar.kt
rename to vector/src/main/java/im/vector/riotx/core/ui/views/PasswordStrengthBar.kt
index 1d53593de4..999b391dd1 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/ui/views/PasswordStrengthBar.kt
+++ b/vector/src/main/java/im/vector/riotx/core/ui/views/PasswordStrengthBar.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.core.ui.views
+package im.vector.riotx.core.ui.views
 
 import android.content.Context
 import android.util.AttributeSet
@@ -24,7 +24,7 @@ import androidx.annotation.IntRange
 import butterknife.BindColor
 import butterknife.BindView
 import butterknife.ButterKnife
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 /**
  * A password strength bar custom widget
diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/DebouncedClickListener.kt b/vector/src/main/java/im/vector/riotx/core/utils/DebouncedClickListener.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/core/utils/DebouncedClickListener.kt
rename to vector/src/main/java/im/vector/riotx/core/utils/DebouncedClickListener.kt
index dd16b89b1b..9625757b11 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/utils/DebouncedClickListener.kt
+++ b/vector/src/main/java/im/vector/riotx/core/utils/DebouncedClickListener.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.core.utils
+package im.vector.riotx.core.utils
 
 import android.view.View
 import java.util.*
diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/Debouncer.kt b/vector/src/main/java/im/vector/riotx/core/utils/Debouncer.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/core/utils/Debouncer.kt
rename to vector/src/main/java/im/vector/riotx/core/utils/Debouncer.kt
index da8532ffce..60e51ad2de 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/utils/Debouncer.kt
+++ b/vector/src/main/java/im/vector/riotx/core/utils/Debouncer.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.core.utils
+package im.vector.riotx.core.utils
 
 
 /**
diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/Dialogs.kt b/vector/src/main/java/im/vector/riotx/core/utils/Dialogs.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/core/utils/Dialogs.kt
rename to vector/src/main/java/im/vector/riotx/core/utils/Dialogs.kt
index fa98574f47..9d73493e74 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/utils/Dialogs.kt
+++ b/vector/src/main/java/im/vector/riotx/core/utils/Dialogs.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.utils
+package im.vector.riotx.core.utils
 
 import android.content.Context
 import android.webkit.WebView
diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/DimensionUtils.kt b/vector/src/main/java/im/vector/riotx/core/utils/DimensionUtils.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/core/utils/DimensionUtils.kt
rename to vector/src/main/java/im/vector/riotx/core/utils/DimensionUtils.kt
index 44659da6af..15257f9c5d 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/utils/DimensionUtils.kt
+++ b/vector/src/main/java/im/vector/riotx/core/utils/DimensionUtils.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.core.utils
+package im.vector.riotx.core.utils
 
 import android.content.Context
 import android.util.TypedValue
diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/Emoji.kt b/vector/src/main/java/im/vector/riotx/core/utils/Emoji.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/core/utils/Emoji.kt
rename to vector/src/main/java/im/vector/riotx/core/utils/Emoji.kt
index 5c572384b4..60a458e9d5 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/utils/Emoji.kt
+++ b/vector/src/main/java/im/vector/riotx/core/utils/Emoji.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.utils
+package im.vector.riotx.core.utils
 
 import android.content.Context
 import com.squareup.moshi.Moshi
-import im.vector.riotredesign.R
-import im.vector.riotredesign.features.reactions.EmojiDataSource
+import im.vector.riotx.R
+import im.vector.riotx.features.reactions.EmojiDataSource
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/ExternalApplicationsUtil.kt b/vector/src/main/java/im/vector/riotx/core/utils/ExternalApplicationsUtil.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotredesign/core/utils/ExternalApplicationsUtil.kt
rename to vector/src/main/java/im/vector/riotx/core/utils/ExternalApplicationsUtil.kt
index 245fe311d8..a8ed3c30f2 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/utils/ExternalApplicationsUtil.kt
+++ b/vector/src/main/java/im/vector/riotx/core/utils/ExternalApplicationsUtil.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.utils
+package im.vector.riotx.core.utils
 
 import android.app.Activity
 import android.content.ActivityNotFoundException
@@ -27,8 +27,8 @@ import android.provider.Browser
 import android.provider.MediaStore
 import androidx.core.content.FileProvider
 import androidx.fragment.app.Fragment
-import im.vector.riotredesign.BuildConfig
-import im.vector.riotredesign.R
+import im.vector.riotx.BuildConfig
+import im.vector.riotx.R
 import timber.log.Timber
 import java.io.File
 import java.text.SimpleDateFormat
diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/FileUtils.kt b/vector/src/main/java/im/vector/riotx/core/utils/FileUtils.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotredesign/core/utils/FileUtils.kt
rename to vector/src/main/java/im/vector/riotx/core/utils/FileUtils.kt
index 8d08ca8553..3c39362ae6 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/utils/FileUtils.kt
+++ b/vector/src/main/java/im/vector/riotx/core/utils/FileUtils.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.utils
+package im.vector.riotx.core.utils
 
 import android.content.Context
 import android.text.TextUtils
diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/LiveEvent.kt b/vector/src/main/java/im/vector/riotx/core/utils/LiveEvent.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/core/utils/LiveEvent.kt
rename to vector/src/main/java/im/vector/riotx/core/utils/LiveEvent.kt
index 178a037779..63dabbd910 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/utils/LiveEvent.kt
+++ b/vector/src/main/java/im/vector/riotx/core/utils/LiveEvent.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.utils
+package im.vector.riotx.core.utils
 
 import androidx.lifecycle.Observer
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/PermissionsTools.kt b/vector/src/main/java/im/vector/riotx/core/utils/PermissionsTools.kt
similarity index 99%
rename from vector/src/main/java/im/vector/riotredesign/core/utils/PermissionsTools.kt
rename to vector/src/main/java/im/vector/riotx/core/utils/PermissionsTools.kt
index d0fd0aca42..01ca16bf35 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/utils/PermissionsTools.kt
+++ b/vector/src/main/java/im/vector/riotx/core/utils/PermissionsTools.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.utils
+package im.vector.riotx.core.utils
 
 import android.Manifest
 import android.app.Activity
@@ -27,7 +27,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 import timber.log.Timber
 import java.util.*
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/RingtoneUtils.kt b/vector/src/main/java/im/vector/riotx/core/utils/RingtoneUtils.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/core/utils/RingtoneUtils.kt
rename to vector/src/main/java/im/vector/riotx/core/utils/RingtoneUtils.kt
index 89c800d49e..e4da72aa3b 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/utils/RingtoneUtils.kt
+++ b/vector/src/main/java/im/vector/riotx/core/utils/RingtoneUtils.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.utils
+package im.vector.riotx.core.utils
 
 import android.content.Context
 import android.media.Ringtone
@@ -22,7 +22,7 @@ import android.media.RingtoneManager
 import android.net.Uri
 import android.preference.PreferenceManager
 import androidx.core.content.edit
-import im.vector.riotredesign.features.settings.PreferencesManager
+import im.vector.riotx.features.settings.PreferencesManager
 
 /**
  * This file manages the sound ringtone for calls.
diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/RxStore.kt b/vector/src/main/java/im/vector/riotx/core/utils/RxStore.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/core/utils/RxStore.kt
rename to vector/src/main/java/im/vector/riotx/core/utils/RxStore.kt
index cbf96a3241..bf35997369 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/utils/RxStore.kt
+++ b/vector/src/main/java/im/vector/riotx/core/utils/RxStore.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.utils
+package im.vector.riotx.core.utils
 
 import com.jakewharton.rxrelay2.BehaviorRelay
 import io.reactivex.Observable
diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/SystemUtils.kt b/vector/src/main/java/im/vector/riotx/core/utils/SystemUtils.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/core/utils/SystemUtils.kt
rename to vector/src/main/java/im/vector/riotx/core/utils/SystemUtils.kt
index c24ae28c37..f387b29619 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/utils/SystemUtils.kt
+++ b/vector/src/main/java/im/vector/riotx/core/utils/SystemUtils.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.utils
+package im.vector.riotx.core.utils
 
 import android.annotation.TargetApi
 import android.app.Activity
@@ -30,9 +30,9 @@ import android.provider.Settings
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
-import im.vector.riotredesign.R
-import im.vector.riotredesign.features.notifications.supportNotificationChannels
-import im.vector.riotredesign.features.settings.VectorLocale
+import im.vector.riotx.R
+import im.vector.riotx.features.notifications.supportNotificationChannels
+import im.vector.riotx.features.settings.VectorLocale
 import timber.log.Timber
 import java.util.*
 
diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/TextUtils.kt b/vector/src/main/java/im/vector/riotx/core/utils/TextUtils.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/core/utils/TextUtils.kt
rename to vector/src/main/java/im/vector/riotx/core/utils/TextUtils.kt
index a65878836c..9d980e7f98 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/utils/TextUtils.kt
+++ b/vector/src/main/java/im/vector/riotx/core/utils/TextUtils.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.utils
+package im.vector.riotx.core.utils
 
 import java.util.*
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/MainActivity.kt b/vector/src/main/java/im/vector/riotx/features/MainActivity.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotredesign/features/MainActivity.kt
rename to vector/src/main/java/im/vector/riotx/features/MainActivity.kt
index f67663ac8a..f8610c29eb 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/MainActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/MainActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features
+package im.vector.riotx.features
 
 import android.app.Activity
 import android.content.Intent
@@ -22,11 +22,11 @@ import android.os.Bundle
 import im.vector.matrix.android.api.Matrix
 import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.auth.Authenticator
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.platform.VectorBaseActivity
-import im.vector.riotredesign.features.home.HomeActivity
-import im.vector.riotredesign.features.login.LoginActivity
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.platform.VectorBaseActivity
+import im.vector.riotx.features.home.HomeActivity
+import im.vector.riotx.features.login.LoginActivity
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/AutocompleteClickListener.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/AutocompleteClickListener.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotredesign/features/autocomplete/AutocompleteClickListener.kt
rename to vector/src/main/java/im/vector/riotx/features/autocomplete/AutocompleteClickListener.kt
index aa2226d5b2..800753d96e 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/AutocompleteClickListener.kt
+++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/AutocompleteClickListener.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.autocomplete
+package im.vector.riotx.features.autocomplete
 
 /**
  * Simple generic listener interface
diff --git a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/EpoxyAutocompletePresenter.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/EpoxyAutocompletePresenter.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotredesign/features/autocomplete/EpoxyAutocompletePresenter.kt
rename to vector/src/main/java/im/vector/riotx/features/autocomplete/EpoxyAutocompletePresenter.kt
index ebdee91b16..1c9e4f7725 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/EpoxyAutocompletePresenter.kt
+++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/EpoxyAutocompletePresenter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.autocomplete
+package im.vector.riotx.features.autocomplete
 
 import android.content.Context
 import android.database.DataSetObserver
diff --git a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/command/AutocompleteCommandController.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandController.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotredesign/features/autocomplete/command/AutocompleteCommandController.kt
rename to vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandController.kt
index 484ee2ce24..2e8334510b 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/command/AutocompleteCommandController.kt
+++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandController.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.autocomplete.command
+package im.vector.riotx.features.autocomplete.command
 
 import com.airbnb.epoxy.TypedEpoxyController
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.features.autocomplete.AutocompleteClickListener
-import im.vector.riotredesign.features.command.Command
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.features.autocomplete.AutocompleteClickListener
+import im.vector.riotx.features.command.Command
 import javax.inject.Inject
 
 class AutocompleteCommandController @Inject constructor(private val stringProvider: StringProvider) : TypedEpoxyController<List<Command>>() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/command/AutocompleteCommandItem.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandItem.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotredesign/features/autocomplete/command/AutocompleteCommandItem.kt
rename to vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandItem.kt
index cd6a0ff06e..2fca219074 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/command/AutocompleteCommandItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandItem.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.autocomplete.command
+package im.vector.riotx.features.autocomplete.command
 
 import android.view.View
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder
-import im.vector.riotredesign.core.epoxy.VectorEpoxyModel
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import im.vector.riotx.core.epoxy.VectorEpoxyModel
 
 @EpoxyModelClass(layout = R.layout.item_autocomplete_command)
 abstract class AutocompleteCommandItem : VectorEpoxyModel<AutocompleteCommandItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/command/AutocompleteCommandPresenter.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandPresenter.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotredesign/features/autocomplete/command/AutocompleteCommandPresenter.kt
rename to vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandPresenter.kt
index 4449d2ed17..866a68f599 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/command/AutocompleteCommandPresenter.kt
+++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandPresenter.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.autocomplete.command
+package im.vector.riotx.features.autocomplete.command
 
 import android.content.Context
 import com.airbnb.epoxy.EpoxyController
-import im.vector.riotredesign.features.autocomplete.EpoxyAutocompletePresenter
-import im.vector.riotredesign.features.command.Command
+import im.vector.riotx.features.autocomplete.EpoxyAutocompletePresenter
+import im.vector.riotx.features.command.Command
 import javax.inject.Inject
 
 class AutocompleteCommandPresenter @Inject constructor(context: Context,
diff --git a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/command/CommandAutocompletePolicy.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/command/CommandAutocompletePolicy.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/autocomplete/command/CommandAutocompletePolicy.kt
rename to vector/src/main/java/im/vector/riotx/features/autocomplete/command/CommandAutocompletePolicy.kt
index a6f9aa722d..db3c0113dd 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/command/CommandAutocompletePolicy.kt
+++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/command/CommandAutocompletePolicy.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.autocomplete.command
+package im.vector.riotx.features.autocomplete.command
 
 import android.text.Spannable
 import com.otaliastudios.autocomplete.AutocompletePolicy
diff --git a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/user/AutocompleteUserController.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/user/AutocompleteUserController.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotredesign/features/autocomplete/user/AutocompleteUserController.kt
rename to vector/src/main/java/im/vector/riotx/features/autocomplete/user/AutocompleteUserController.kt
index dcf2817a89..cdf0449795 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/user/AutocompleteUserController.kt
+++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/user/AutocompleteUserController.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.autocomplete.user
+package im.vector.riotx.features.autocomplete.user
 
 import com.airbnb.epoxy.TypedEpoxyController
 import im.vector.matrix.android.api.session.user.model.User
-import im.vector.riotredesign.features.autocomplete.AutocompleteClickListener
-import im.vector.riotredesign.features.home.AvatarRenderer
+import im.vector.riotx.features.autocomplete.AutocompleteClickListener
+import im.vector.riotx.features.home.AvatarRenderer
 import javax.inject.Inject
 
 class AutocompleteUserController @Inject constructor(): TypedEpoxyController<List<User>>() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/user/AutocompleteUserItem.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/user/AutocompleteUserItem.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotredesign/features/autocomplete/user/AutocompleteUserItem.kt
rename to vector/src/main/java/im/vector/riotx/features/autocomplete/user/AutocompleteUserItem.kt
index 17cbde66c5..82ba9a4170 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/user/AutocompleteUserItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/user/AutocompleteUserItem.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.autocomplete.user
+package im.vector.riotx.features.autocomplete.user
 
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder
-import im.vector.riotredesign.core.epoxy.VectorEpoxyModel
-import im.vector.riotredesign.features.home.AvatarRenderer
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.riotx.features.home.AvatarRenderer
 
 @EpoxyModelClass(layout = R.layout.item_autocomplete_user)
 abstract class AutocompleteUserItem : VectorEpoxyModel<AutocompleteUserItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/user/AutocompleteUserPresenter.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/user/AutocompleteUserPresenter.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotredesign/features/autocomplete/user/AutocompleteUserPresenter.kt
rename to vector/src/main/java/im/vector/riotx/features/autocomplete/user/AutocompleteUserPresenter.kt
index b525cfacc7..800e8e77d6 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/user/AutocompleteUserPresenter.kt
+++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/user/AutocompleteUserPresenter.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.autocomplete.user
+package im.vector.riotx.features.autocomplete.user
 
 import android.content.Context
 import com.airbnb.epoxy.EpoxyController
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Success
 import im.vector.matrix.android.api.session.user.model.User
-import im.vector.riotredesign.features.autocomplete.EpoxyAutocompletePresenter
+import im.vector.riotx.features.autocomplete.EpoxyAutocompletePresenter
 import javax.inject.Inject
 
 class AutocompleteUserPresenter @Inject constructor(context: Context,
diff --git a/vector/src/main/java/im/vector/riotredesign/features/badge/BadgeProxy.kt b/vector/src/main/java/im/vector/riotx/features/badge/BadgeProxy.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotredesign/features/badge/BadgeProxy.kt
rename to vector/src/main/java/im/vector/riotx/features/badge/BadgeProxy.kt
index d0b7623c06..e3e3cca1fe 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/badge/BadgeProxy.kt
+++ b/vector/src/main/java/im/vector/riotx/features/badge/BadgeProxy.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.badge
+package im.vector.riotx.features.badge
 
 import android.content.Context
 import android.os.Build
diff --git a/vector/src/main/java/im/vector/riotredesign/features/command/Command.kt b/vector/src/main/java/im/vector/riotx/features/command/Command.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/features/command/Command.kt
rename to vector/src/main/java/im/vector/riotx/features/command/Command.kt
index a41a3afd42..a9825b05d1 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/command/Command.kt
+++ b/vector/src/main/java/im/vector/riotx/features/command/Command.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.command
+package im.vector.riotx.features.command
 
 import androidx.annotation.StringRes
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 /**
  * Defines the command line operations
diff --git a/vector/src/main/java/im/vector/riotredesign/features/command/CommandParser.kt b/vector/src/main/java/im/vector/riotx/features/command/CommandParser.kt
similarity index 99%
rename from vector/src/main/java/im/vector/riotredesign/features/command/CommandParser.kt
rename to vector/src/main/java/im/vector/riotx/features/command/CommandParser.kt
index 3715c017df..2ef9fe0dfc 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/command/CommandParser.kt
+++ b/vector/src/main/java/im/vector/riotx/features/command/CommandParser.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.command
+package im.vector.riotx.features.command
 
 import im.vector.matrix.android.api.MatrixPatterns
 import timber.log.Timber
diff --git a/vector/src/main/java/im/vector/riotredesign/features/command/ParsedCommand.kt b/vector/src/main/java/im/vector/riotx/features/command/ParsedCommand.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/command/ParsedCommand.kt
rename to vector/src/main/java/im/vector/riotx/features/command/ParsedCommand.kt
index 350423b1d3..1786e597f2 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/command/ParsedCommand.kt
+++ b/vector/src/main/java/im/vector/riotx/features/command/ParsedCommand.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.command
+package im.vector.riotx.features.command
 
 /**
  * Represent a parsed command
diff --git a/vector/src/main/java/im/vector/riotredesign/features/configuration/VectorConfiguration.kt b/vector/src/main/java/im/vector/riotx/features/configuration/VectorConfiguration.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/configuration/VectorConfiguration.kt
rename to vector/src/main/java/im/vector/riotx/features/configuration/VectorConfiguration.kt
index 3790661aba..cb96d50dd9 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/configuration/VectorConfiguration.kt
+++ b/vector/src/main/java/im/vector/riotx/features/configuration/VectorConfiguration.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.configuration
+package im.vector.riotx.features.configuration
 
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.res.Configuration
 import android.os.Build
-import im.vector.riotredesign.features.settings.FontScale
-import im.vector.riotredesign.features.settings.VectorLocale
-import im.vector.riotredesign.features.themes.ThemeUtils
+import im.vector.riotx.features.settings.FontScale
+import im.vector.riotx.features.settings.VectorLocale
+import im.vector.riotx.features.themes.ThemeUtils
 import timber.log.Timber
 import java.util.*
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keys/KeysExporter.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysExporter.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keys/KeysExporter.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysExporter.kt
index 6527c2634a..396723ea33 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keys/KeysExporter.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysExporter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.crypto.keys
+package im.vector.riotx.features.crypto.keys
 
 import android.content.Context
 import android.os.Environment
@@ -22,8 +22,8 @@ import arrow.core.Try
 import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.internal.extensions.foldToCallback
-import im.vector.riotredesign.core.files.addEntryToDownloadManager
-import im.vector.riotredesign.core.files.writeToFile
+import im.vector.riotx.core.files.addEntryToDownloadManager
+import im.vector.riotx.core.files.writeToFile
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keys/KeysImporter.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysImporter.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keys/KeysImporter.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysImporter.kt
index e4ed46f6a4..041306c4ad 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keys/KeysImporter.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysImporter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.crypto.keys
+package im.vector.riotx.features.crypto.keys
 
 import android.content.Context
 import android.net.Uri
@@ -22,8 +22,8 @@ import arrow.core.Try
 import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult
-import im.vector.riotredesign.core.intent.getMimeTypeFromUri
-import im.vector.riotredesign.core.resources.openResource
+import im.vector.riotx.core.intent.getMimeTypeFromUri
+import im.vector.riotx.core.resources.openResource
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt
index 333342e1a1..74cf022595 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.crypto.keysbackup.restore
+package im.vector.riotx.features.crypto.keysbackup.restore
 
 import android.app.Activity
 import android.content.Context
@@ -23,9 +23,9 @@ import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
 import im.vector.fragments.keysbackup.restore.KeysBackupRestoreFromPassphraseFragment
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.extensions.observeEvent
-import im.vector.riotredesign.core.platform.SimpleFragmentActivity
+import im.vector.riotx.R
+import im.vector.riotx.core.extensions.observeEvent
+import im.vector.riotx.core.platform.SimpleFragmentActivity
 
 class KeysBackupRestoreActivity : SimpleFragmentActivity() {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt
index 0c2eb7883f..b11a08b97b 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.crypto.keysbackup.restore
+package im.vector.riotx.features.crypto.keysbackup.restore
 
 import android.app.Activity
 import android.content.Intent
@@ -27,10 +27,10 @@ import butterknife.BindView
 import butterknife.OnClick
 import butterknife.OnTextChanged
 import com.google.android.material.textfield.TextInputLayout
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.platform.VectorBaseFragment
-import im.vector.riotredesign.core.utils.startImportTextFromFileIntent
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.riotx.core.utils.startImportTextFromFileIntent
 import timber.log.Timber
 
 class KeysBackupRestoreFromKeyFragment : VectorBaseFragment() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt
index 99a36f3057..c4da3038e0 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.crypto.keysbackup.restore
+package im.vector.riotx.features.crypto.keysbackup.restore
 
 import android.content.Context
 import androidx.lifecycle.MutableLiveData
@@ -23,9 +23,9 @@ import im.vector.matrix.android.api.listeners.StepProgressListener
 import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupService
 import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult
 import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.platform.WaitingViewData
-import im.vector.riotredesign.core.ui.views.KeysBackupBanner
+import im.vector.riotx.R
+import im.vector.riotx.core.platform.WaitingViewData
+import im.vector.riotx.core.ui.views.KeysBackupBanner
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt
index a0da69fb1a..c7b349c896 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt
@@ -32,12 +32,12 @@ import butterknife.BindView
 import butterknife.OnClick
 import butterknife.OnTextChanged
 import com.google.android.material.textfield.TextInputLayout
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.extensions.showPassword
-import im.vector.riotredesign.core.platform.VectorBaseFragment
-import im.vector.riotredesign.features.crypto.keysbackup.restore.KeysBackupRestoreFromPassphraseViewModel
-import im.vector.riotredesign.features.crypto.keysbackup.restore.KeysBackupRestoreSharedViewModel
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.extensions.showPassword
+import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreFromPassphraseViewModel
+import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreSharedViewModel
 
 class KeysBackupRestoreFromPassphraseFragment : VectorBaseFragment() {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt
index bdbfd23bb7..3a4a952892 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.crypto.keysbackup.restore
+package im.vector.riotx.features.crypto.keysbackup.restore
 
 import android.content.Context
 import androidx.lifecycle.MutableLiveData
@@ -23,9 +23,9 @@ import im.vector.matrix.android.api.listeners.StepProgressListener
 import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupService
 import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult
 import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.platform.WaitingViewData
-import im.vector.riotredesign.core.ui.views.KeysBackupBanner
+import im.vector.riotx.R
+import im.vector.riotx.core.platform.WaitingViewData
+import im.vector.riotx.core.ui.views.KeysBackupBanner
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt
index d6c618bad4..5eadbb709d 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.crypto.keysbackup.restore
+package im.vector.riotx.features.crypto.keysbackup.restore
 
 import android.content.Context
 import androidx.lifecycle.LiveData
@@ -23,9 +23,9 @@ import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult
 import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.platform.WaitingViewData
-import im.vector.riotredesign.core.utils.LiveEvent
+import im.vector.riotx.R
+import im.vector.riotx.core.platform.WaitingViewData
+import im.vector.riotx.core.utils.LiveEvent
 import javax.inject.Inject
 
 class KeysBackupRestoreSharedViewModel @Inject constructor() : ViewModel() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
index def561ac5c..b743f88ea6 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.crypto.keysbackup.restore
+package im.vector.riotx.features.crypto.keysbackup.restore
 
 import android.os.Bundle
 import android.widget.TextView
 import androidx.lifecycle.ViewModelProviders
 import butterknife.BindView
 import butterknife.OnClick
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.platform.VectorBaseFragment
-import im.vector.riotredesign.core.utils.LiveEvent
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.riotx.core.utils.LiveEvent
 
 class KeysBackupRestoreSuccessFragment : VectorBaseFragment() {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt
index 273b32aae9..32e0859706 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt
@@ -13,19 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.crypto.keysbackup.settings
+package im.vector.riotx.features.crypto.keysbackup.settings
 
 import android.content.Context
 import android.content.Intent
-import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.viewModel
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.platform.SimpleFragmentActivity
-import im.vector.riotredesign.core.platform.WaitingViewData
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.platform.SimpleFragmentActivity
+import im.vector.riotx.core.platform.WaitingViewData
 import javax.inject.Inject
 
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt
index b04949fd08..5288300402 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.crypto.keysbackup.settings
+package im.vector.riotx.features.crypto.keysbackup.settings
 
 import android.view.View
 import android.widget.Button
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder
-import im.vector.riotredesign.core.epoxy.VectorEpoxyModel
-import im.vector.riotredesign.core.extensions.setTextOrHide
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.riotx.core.extensions.setTextOrHide
 
 @EpoxyModelClass(layout = R.layout.item_keys_backup_settings_button_footer)
 abstract class KeysBackupSettingFooterItem : VectorEpoxyModel<KeysBackupSettingFooterItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt
index 0b7244b77e..4800701ede 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.crypto.keysbackup.settings
+package im.vector.riotx.features.crypto.keysbackup.settings
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt
index 72a97f372d..c5c0d9d628 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.crypto.keysbackup.settings
+package im.vector.riotx.features.crypto.keysbackup.settings
 
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AlertDialog
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.platform.VectorBaseFragment
-import im.vector.riotredesign.features.crypto.keysbackup.restore.KeysBackupRestoreActivity
-import im.vector.riotredesign.features.crypto.keysbackup.setup.KeysBackupSetupActivity
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreActivity
+import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupActivity
 import kotlinx.android.synthetic.main.fragment_keys_backup_settings.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt
index 6e555b58dd..95e59007bb 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.crypto.keysbackup.settings
+package im.vector.riotx.features.crypto.keysbackup.settings
 
 import android.view.View
 import com.airbnb.epoxy.TypedEpoxyController
@@ -25,12 +25,12 @@ import com.airbnb.mvrx.Uninitialized
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState
 import im.vector.matrix.android.internal.crypto.keysbackup.model.KeysBackupVersionTrust
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.errorWithRetryItem
-import im.vector.riotredesign.core.epoxy.loadingItem
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.core.ui.list.GenericItem
-import im.vector.riotredesign.core.ui.list.genericItem
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.errorWithRetryItem
+import im.vector.riotx.core.epoxy.loadingItem
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.core.ui.list.GenericItem
+import im.vector.riotx.core.ui.list.genericItem
 import java.util.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt
index d656d90c4d..5ce1ab9845 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.crypto.keysbackup.settings
+package im.vector.riotx.features.crypto.keysbackup.settings
 
 import com.airbnb.mvrx.ActivityViewModelContext
 import com.airbnb.mvrx.Fail
@@ -30,7 +30,7 @@ import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupService
 import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState
 import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupStateListener
 import im.vector.matrix.android.internal.crypto.keysbackup.model.KeysBackupVersionTrust
-import im.vector.riotredesign.core.platform.VectorViewModel
+import im.vector.riotx.core.platform.VectorViewModel
 
 
 class KeysBackupSettingsViewModel @AssistedInject constructor(@Assisted initialState: KeysBackupSettingViewState,
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt
index c5e479fc19..77780016b9 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.crypto.keysbackup.setup
+package im.vector.riotx.features.crypto.keysbackup.setup
 
 import android.content.Context
 import android.content.Intent
@@ -23,12 +23,12 @@ import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
 import im.vector.matrix.android.api.MatrixCallback
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.dialogs.ExportKeysDialog
-import im.vector.riotredesign.core.extensions.observeEvent
-import im.vector.riotredesign.core.platform.SimpleFragmentActivity
-import im.vector.riotredesign.core.utils.toast
-import im.vector.riotredesign.features.crypto.keys.KeysExporter
+import im.vector.riotx.R
+import im.vector.riotx.core.dialogs.ExportKeysDialog
+import im.vector.riotx.core.extensions.observeEvent
+import im.vector.riotx.core.platform.SimpleFragmentActivity
+import im.vector.riotx.core.utils.toast
+import im.vector.riotx.features.crypto.keys.KeysExporter
 
 class KeysBackupSetupActivity : SimpleFragmentActivity() {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt
index 1381b92216..c5cf91009e 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.crypto.keysbackup.setup
+package im.vector.riotx.features.crypto.keysbackup.setup
 
 import android.content.Context
 import androidx.lifecycle.MutableLiveData
@@ -27,9 +27,9 @@ import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupService
 import im.vector.matrix.android.internal.crypto.keysbackup.model.MegolmBackupCreationInfo
 import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersion
 import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.platform.WaitingViewData
-import im.vector.riotredesign.core.utils.LiveEvent
+import im.vector.riotx.R
+import im.vector.riotx.core.platform.WaitingViewData
+import im.vector.riotx.core.utils.LiveEvent
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt
index d1fe142a29..75c1a63812 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.crypto.keysbackup.setup
+package im.vector.riotx.features.crypto.keysbackup.setup
 
 import android.os.Bundle
 import android.view.View
@@ -24,10 +24,10 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
 import butterknife.BindView
 import butterknife.OnClick
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.platform.VectorBaseFragment
-import im.vector.riotredesign.core.utils.LiveEvent
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.riotx.core.utils.LiveEvent
 
 class KeysBackupSetupStep1Fragment : VectorBaseFragment() {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt
index 7d0ca7970b..b31fe2a24c 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.crypto.keysbackup.setup
+package im.vector.riotx.features.crypto.keysbackup.setup
 
 import android.os.AsyncTask
 import android.os.Bundle
@@ -30,12 +30,12 @@ import butterknife.OnClick
 import butterknife.OnTextChanged
 import com.google.android.material.textfield.TextInputLayout
 import com.nulabinc.zxcvbn.Zxcvbn
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.extensions.showPassword
-import im.vector.riotredesign.core.platform.VectorBaseFragment
-import im.vector.riotredesign.core.ui.views.PasswordStrengthBar
-import im.vector.riotredesign.features.settings.VectorLocale
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.extensions.showPassword
+import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.riotx.core.ui.views.PasswordStrengthBar
+import im.vector.riotx.features.settings.VectorLocale
 
 
 class KeysBackupSetupStep2Fragment : VectorBaseFragment() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
index dd93777069..db400e5b39 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.crypto.keysbackup.setup
+package im.vector.riotx.features.crypto.keysbackup.setup
 
 import android.os.Bundle
 import android.os.Environment
@@ -29,12 +29,12 @@ import arrow.core.Try
 import butterknife.BindView
 import butterknife.OnClick
 import com.google.android.material.bottomsheet.BottomSheetDialog
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.files.addEntryToDownloadManager
-import im.vector.riotredesign.core.files.writeToFile
-import im.vector.riotredesign.core.platform.VectorBaseFragment
-import im.vector.riotredesign.core.utils.*
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.files.addEntryToDownloadManager
+import im.vector.riotx.core.files.writeToFile
+import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.riotx.core.utils.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysrequest/KeyRequestHandler.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysrequest/KeyRequestHandler.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysrequest/KeyRequestHandler.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/keysrequest/KeyRequestHandler.kt
index a583760a7f..1bbd8b38bf 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysrequest/KeyRequestHandler.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysrequest/KeyRequestHandler.kt
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.crypto.keysrequest
+package im.vector.riotx.features.crypto.keysrequest
 
 import android.content.Context
 import android.text.TextUtils
@@ -33,9 +33,9 @@ import im.vector.matrix.android.internal.crypto.model.MXDeviceInfo
 import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
 import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo
 import im.vector.matrix.android.internal.crypto.model.rest.DevicesListResponse
-import im.vector.riotredesign.R
-import im.vector.riotredesign.features.crypto.verification.SASVerificationActivity
-import im.vector.riotredesign.features.popup.PopupAlertManager
+import im.vector.riotx.R
+import im.vector.riotx.features.crypto.verification.SASVerificationActivity
+import im.vector.riotx.features.popup.PopupAlertManager
 import timber.log.Timber
 import java.text.DateFormat
 import java.text.SimpleDateFormat
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/IncomingVerificationRequestHandler.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/IncomingVerificationRequestHandler.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/verification/IncomingVerificationRequestHandler.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/verification/IncomingVerificationRequestHandler.kt
index cfa35ed4af..7f7c4741a2 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/IncomingVerificationRequestHandler.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/IncomingVerificationRequestHandler.kt
@@ -13,17 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.crypto.verification
+package im.vector.riotx.features.crypto.verification
 
 import android.content.Context
-import im.vector.matrix.android.api.Matrix
-import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.crypto.sas.SasVerificationService
 import im.vector.matrix.android.api.session.crypto.sas.SasVerificationTransaction
 import im.vector.matrix.android.api.session.crypto.sas.SasVerificationTxState
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.features.popup.PopupAlertManager
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.features.popup.PopupAlertManager
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationActivity.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationActivity.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationActivity.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationActivity.kt
index c66a001cee..2c695cad6e 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationActivity.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.crypto.verification
+package im.vector.riotx.features.crypto.verification
 
 import android.app.Activity
 import android.content.Context
@@ -26,10 +26,10 @@ import im.vector.matrix.android.api.session.crypto.sas.CancelCode
 import im.vector.matrix.android.api.session.crypto.sas.IncomingSasVerificationTransaction
 import im.vector.matrix.android.api.session.crypto.sas.OutgoingSasVerificationRequest
 import im.vector.matrix.android.api.session.crypto.sas.SasVerificationTxState
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.extensions.observeEvent
-import im.vector.riotredesign.core.platform.SimpleFragmentActivity
-import im.vector.riotredesign.core.platform.WaitingViewData
+import im.vector.riotx.R
+import im.vector.riotx.core.extensions.observeEvent
+import im.vector.riotx.core.platform.SimpleFragmentActivity
+import im.vector.riotx.core.platform.WaitingViewData
 
 class SASVerificationActivity : SimpleFragmentActivity() {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationIncomingFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationIncomingFragment.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationIncomingFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationIncomingFragment.kt
index 6acbad5512..bd0ec22301 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationIncomingFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationIncomingFragment.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.crypto.verification
+package im.vector.riotx.features.crypto.verification
 
 import android.os.Bundle
 import android.widget.ImageView
@@ -23,10 +23,10 @@ import androidx.lifecycle.ViewModelProviders
 import butterknife.BindView
 import butterknife.OnClick
 import im.vector.matrix.android.api.session.crypto.sas.IncomingSasVerificationTransaction
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.platform.VectorBaseFragment
-import im.vector.riotredesign.features.home.AvatarRenderer
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.riotx.features.home.AvatarRenderer
 import javax.inject.Inject
 
 class SASVerificationIncomingFragment : VectorBaseFragment() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationShortCodeFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationShortCodeFragment.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationShortCodeFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationShortCodeFragment.kt
index faf409956a..5cc0d525d0 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationShortCodeFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationShortCodeFragment.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.crypto.verification
+package im.vector.riotx.features.crypto.verification
 
 import android.os.Bundle
 import android.view.ViewGroup
@@ -26,8 +26,8 @@ import butterknife.BindView
 import butterknife.OnClick
 import im.vector.matrix.android.api.session.crypto.sas.IncomingSasVerificationTransaction
 import im.vector.matrix.android.api.session.crypto.sas.OutgoingSasVerificationRequest
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.platform.VectorBaseFragment
+import im.vector.riotx.R
+import im.vector.riotx.core.platform.VectorBaseFragment
 
 class SASVerificationShortCodeFragment : VectorBaseFragment() {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationStartFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationStartFragment.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationStartFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationStartFragment.kt
index ce92888c5c..30b2a26b12 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationStartFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationStartFragment.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.crypto.verification
+package im.vector.riotx.features.crypto.verification
 
 import android.os.Bundle
 import android.view.ViewGroup
@@ -28,9 +28,9 @@ import androidx.transition.TransitionManager
 import butterknife.BindView
 import butterknife.OnClick
 import im.vector.matrix.android.api.session.crypto.sas.OutgoingSasVerificationRequest
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.platform.VectorBaseActivity
-import im.vector.riotredesign.core.platform.VectorBaseFragment
+import im.vector.riotx.R
+import im.vector.riotx.core.platform.VectorBaseActivity
+import im.vector.riotx.core.platform.VectorBaseFragment
 
 class SASVerificationStartFragment : VectorBaseFragment() {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationVerifiedFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationVerifiedFragment.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationVerifiedFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationVerifiedFragment.kt
index 47e874bed1..5392f89eb6 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationVerifiedFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationVerifiedFragment.kt
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.crypto.verification
+package im.vector.riotx.features.crypto.verification
 
 import android.os.Bundle
 import androidx.lifecycle.ViewModelProviders
 import butterknife.OnClick
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.platform.VectorBaseFragment
+import im.vector.riotx.R
+import im.vector.riotx.core.platform.VectorBaseFragment
 
 class SASVerificationVerifiedFragment : VectorBaseFragment() {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SasVerificationViewModel.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SasVerificationViewModel.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SasVerificationViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/crypto/verification/SasVerificationViewModel.kt
index 31fc91a48a..87a420d333 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SasVerificationViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SasVerificationViewModel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.crypto.verification
+package im.vector.riotx.features.crypto.verification
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
@@ -24,7 +24,7 @@ import im.vector.matrix.android.api.session.crypto.sas.SasVerificationService
 import im.vector.matrix.android.api.session.crypto.sas.SasVerificationTransaction
 import im.vector.matrix.android.api.session.crypto.sas.SasVerificationTxState
 import im.vector.matrix.android.api.session.user.model.User
-import im.vector.riotredesign.core.utils.LiveEvent
+import im.vector.riotx.core.utils.LiveEvent
 import javax.inject.Inject
 
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/disclaimer/DisclaimerDialog.kt b/vector/src/main/java/im/vector/riotx/features/disclaimer/DisclaimerDialog.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotredesign/features/disclaimer/DisclaimerDialog.kt
rename to vector/src/main/java/im/vector/riotx/features/disclaimer/DisclaimerDialog.kt
index bf4a409428..6756033f13 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/disclaimer/DisclaimerDialog.kt
+++ b/vector/src/main/java/im/vector/riotx/features/disclaimer/DisclaimerDialog.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.disclaimer
+package im.vector.riotx.features.disclaimer
 
 import android.app.Activity
 import android.preference.PreferenceManager
@@ -22,10 +22,10 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.edit
-import im.vector.riotredesign.BuildConfig
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.extensions.setTextWithColoredPart
-import im.vector.riotredesign.core.utils.openPlayStore
+import im.vector.riotx.BuildConfig
+import im.vector.riotx.R
+import im.vector.riotx.core.extensions.setTextWithColoredPart
+import im.vector.riotx.core.utils.openPlayStore
 
 // Increase this value to show again the disclaimer dialog after an upgrade of the application
 private const val CURRENT_DISCLAIMER_VALUE = 1
diff --git a/vector/src/main/java/im/vector/riotredesign/features/form/FormEditTextItem.kt b/vector/src/main/java/im/vector/riotx/features/form/FormEditTextItem.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotredesign/features/form/FormEditTextItem.kt
rename to vector/src/main/java/im/vector/riotx/features/form/FormEditTextItem.kt
index e714f61e07..06f364ab6f 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/form/FormEditTextItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/form/FormEditTextItem.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.form
+package im.vector.riotx.features.form
 
 import android.text.Editable
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder
-import im.vector.riotredesign.core.epoxy.VectorEpoxyModel
-import im.vector.riotredesign.core.platform.SimpleTextWatcher
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.riotx.core.platform.SimpleTextWatcher
 
 @EpoxyModelClass(layout = R.layout.item_form_text_input)
 abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/form/FormSwitchItem.kt b/vector/src/main/java/im/vector/riotx/features/form/FormSwitchItem.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotredesign/features/form/FormSwitchItem.kt
rename to vector/src/main/java/im/vector/riotx/features/form/FormSwitchItem.kt
index 6d8f627202..893858ac15 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/form/FormSwitchItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/form/FormSwitchItem.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.form
+package im.vector.riotx.features.form
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.google.android.material.switchmaterial.SwitchMaterial
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder
-import im.vector.riotredesign.core.epoxy.VectorEpoxyModel
-import im.vector.riotredesign.core.extensions.setTextOrHide
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.riotx.core.extensions.setTextOrHide
 
 @EpoxyModelClass(layout = R.layout.item_form_switch)
 abstract class FormSwitchItem : VectorEpoxyModel<FormSwitchItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/AvatarRenderer.kt b/vector/src/main/java/im/vector/riotx/features/home/AvatarRenderer.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/features/home/AvatarRenderer.kt
rename to vector/src/main/java/im/vector/riotx/features/home/AvatarRenderer.kt
index a9943a6e29..83829e468c 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/AvatarRenderer.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/AvatarRenderer.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home
+package im.vector.riotx.features.home
 
 import android.content.Context
 import android.graphics.drawable.Drawable
@@ -30,11 +30,11 @@ import im.vector.matrix.android.api.MatrixPatterns
 import im.vector.matrix.android.api.session.content.ContentUrlResolver
 import im.vector.matrix.android.api.session.room.model.RoomSummary
 import im.vector.matrix.android.api.session.user.model.User
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.core.glide.GlideApp
-import im.vector.riotredesign.core.glide.GlideRequest
-import im.vector.riotredesign.core.glide.GlideRequests
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.core.glide.GlideApp
+import im.vector.riotx.core.glide.GlideRequest
+import im.vector.riotx.core.glide.GlideRequests
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
rename to vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt
index 71d40de54b..11d1248c74 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home
+package im.vector.riotx.features.home
 
 import android.app.ProgressDialog
 import android.content.Context
@@ -29,23 +29,23 @@ import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
 import com.airbnb.mvrx.viewModel
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.extensions.hideKeyboard
-import im.vector.riotredesign.core.extensions.observeEvent
-import im.vector.riotredesign.core.extensions.replaceFragment
-import im.vector.riotredesign.core.platform.OnBackPressed
-import im.vector.riotredesign.core.platform.ToolbarConfigurable
-import im.vector.riotredesign.core.platform.VectorBaseActivity
-import im.vector.riotredesign.core.pushers.PushersManager
-import im.vector.riotredesign.features.crypto.keysrequest.KeyRequestHandler
-import im.vector.riotredesign.features.crypto.verification.IncomingVerificationRequestHandler
-import im.vector.riotredesign.features.disclaimer.showDisclaimerDialog
-import im.vector.riotredesign.features.notifications.NotificationDrawerManager
-import im.vector.riotredesign.features.rageshake.VectorUncaughtExceptionHandler
-import im.vector.riotredesign.features.workers.signout.SignOutViewModel
-import im.vector.riotredesign.push.fcm.FcmHelper
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.extensions.hideKeyboard
+import im.vector.riotx.core.extensions.observeEvent
+import im.vector.riotx.core.extensions.replaceFragment
+import im.vector.riotx.core.platform.OnBackPressed
+import im.vector.riotx.core.platform.ToolbarConfigurable
+import im.vector.riotx.core.platform.VectorBaseActivity
+import im.vector.riotx.core.pushers.PushersManager
+import im.vector.riotx.features.crypto.keysrequest.KeyRequestHandler
+import im.vector.riotx.features.crypto.verification.IncomingVerificationRequestHandler
+import im.vector.riotx.features.disclaimer.showDisclaimerDialog
+import im.vector.riotx.features.notifications.NotificationDrawerManager
+import im.vector.riotx.features.rageshake.VectorUncaughtExceptionHandler
+import im.vector.riotx.features.workers.signout.SignOutViewModel
+import im.vector.riotx.push.fcm.FcmHelper
 import kotlinx.android.synthetic.main.activity_home.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewModel.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/home/HomeActivityViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewModel.kt
index a2f373fa4c..36d5725561 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivityViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home
+package im.vector.riotx.features.home
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
@@ -31,9 +31,9 @@ import im.vector.matrix.android.api.session.group.model.GroupSummary
 import im.vector.matrix.android.api.session.room.model.RoomSummary
 import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams
 import im.vector.matrix.rx.rx
-import im.vector.riotredesign.core.platform.VectorViewModel
-import im.vector.riotredesign.features.home.group.ALL_COMMUNITIES_GROUP_ID
-import im.vector.riotredesign.features.home.group.SelectedGroupStore
+import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.riotx.features.home.group.ALL_COMMUNITIES_GROUP_ID
+import im.vector.riotx.features.home.group.SelectedGroupStore
 import io.reactivex.Observable
 import io.reactivex.functions.BiFunction
 import java.util.concurrent.TimeUnit
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt
index 4ea3df5dc4..e24ae7ffbf 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home
+package im.vector.riotx.features.home
 
 import android.os.Bundle
 import android.os.Parcelable
@@ -31,15 +31,15 @@ import com.google.android.material.bottomnavigation.BottomNavigationMenuView
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState
 import im.vector.matrix.android.api.session.sync.SyncState
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.platform.ToolbarConfigurable
-import im.vector.riotredesign.core.platform.VectorBaseFragment
-import im.vector.riotredesign.core.ui.views.KeysBackupBanner
-import im.vector.riotredesign.features.home.room.list.RoomListFragment
-import im.vector.riotredesign.features.home.room.list.RoomListParams
-import im.vector.riotredesign.features.home.room.list.UnreadCounterBadgeView
-import im.vector.riotredesign.features.workers.signout.SignOutViewModel
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.platform.ToolbarConfigurable
+import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.riotx.core.ui.views.KeysBackupBanner
+import im.vector.riotx.features.home.room.list.RoomListFragment
+import im.vector.riotx.features.home.room.list.RoomListParams
+import im.vector.riotx.features.home.room.list.UnreadCounterBadgeView
+import im.vector.riotx.features.workers.signout.SignOutViewModel
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.fragment_home_detail.*
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewModel.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewModel.kt
index 59ff9a7581..2b5a993ed2 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home
+package im.vector.riotx.features.home
 
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
@@ -23,7 +23,7 @@ import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.rx.rx
-import im.vector.riotredesign.core.platform.VectorViewModel
+import im.vector.riotx.core.platform.VectorViewModel
 
 /**
  * View model used to update the home bottom bar notification counts
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailViewState.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewState.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailViewState.kt
rename to vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewState.kt
index f201ea79d2..970951bfba 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailViewState.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewState.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home
+package im.vector.riotx.features.home
 
 import com.airbnb.mvrx.MvRxState
 import im.vector.matrix.android.api.session.sync.SyncState
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDrawerFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeDrawerFragment.kt
similarity index 85%
rename from vector/src/main/java/im/vector/riotredesign/features/home/HomeDrawerFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/home/HomeDrawerFragment.kt
index 378b6a1b00..832e8a5e4f 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDrawerFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/HomeDrawerFragment.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home
+package im.vector.riotx.features.home
 
 import android.os.Bundle
 import im.vector.matrix.android.api.session.Session
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.extensions.observeK
-import im.vector.riotredesign.core.extensions.replaceChildFragment
-import im.vector.riotredesign.core.platform.VectorBaseFragment
-import im.vector.riotredesign.features.home.group.GroupListFragment
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.extensions.observeK
+import im.vector.riotx.core.extensions.replaceChildFragment
+import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.riotx.features.home.group.GroupListFragment
 import kotlinx.android.synthetic.main.fragment_home_drawer.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeModule.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeModule.kt
similarity index 79%
rename from vector/src/main/java/im/vector/riotredesign/features/home/HomeModule.kt
rename to vector/src/main/java/im/vector/riotx/features/home/HomeModule.kt
index eee5b8e83f..4c65aed24d 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeModule.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/HomeModule.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home
+package im.vector.riotx.features.home
 
 import android.os.Handler
 import dagger.Module
 import dagger.Provides
-import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventControllerHandler
-import im.vector.riotredesign.features.home.room.detail.timeline.helper.TimelineAsyncHelper
+import im.vector.riotx.features.home.room.detail.timeline.TimelineEventControllerHandler
+import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineAsyncHelper
 
 @Module
 object HomeModule {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeNavigationViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeNavigationViewModel.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotredesign/features/home/HomeNavigationViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/home/HomeNavigationViewModel.kt
index c678b5f5b3..2d7a121d5d 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeNavigationViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/HomeNavigationViewModel.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home
+package im.vector.riotx.features.home
 
-import im.vector.riotredesign.core.mvrx.NavigationViewModel
+import im.vector.riotx.core.mvrx.NavigationViewModel
 import javax.inject.Inject
 
 class HomeNavigationViewModel @Inject constructor() : NavigationViewModel<HomeActivity.Navigation>()
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeNavigator.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeNavigator.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotredesign/features/home/HomeNavigator.kt
rename to vector/src/main/java/im/vector/riotx/features/home/HomeNavigator.kt
index 0d1c320659..680d7bbc33 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeNavigator.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/HomeNavigator.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home
+package im.vector.riotx.features.home
 
 import androidx.core.view.GravityCompat
 import im.vector.matrix.android.api.session.group.model.GroupSummary
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.extensions.replaceFragment
+import im.vector.riotx.R
+import im.vector.riotx.core.extensions.replaceFragment
 import kotlinx.android.synthetic.main.activity_home.*
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeRoomListObservableStore.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeRoomListObservableStore.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotredesign/features/home/HomeRoomListObservableStore.kt
rename to vector/src/main/java/im/vector/riotx/features/home/HomeRoomListObservableStore.kt
index e455961fa1..f1f7e551d3 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeRoomListObservableStore.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/HomeRoomListObservableStore.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home
+package im.vector.riotx.features.home
 
 import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.riotredesign.core.utils.RxStore
-import im.vector.riotredesign.features.home.room.list.RoomListDisplayModeFilter
-import im.vector.riotredesign.features.home.room.list.RoomListFragment
+import im.vector.riotx.core.utils.RxStore
+import im.vector.riotx.features.home.room.list.RoomListDisplayModeFilter
+import im.vector.riotx.features.home.room.list.RoomListFragment
 import io.reactivex.Observable
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/LoadingFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/LoadingFragment.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotredesign/features/home/LoadingFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/home/LoadingFragment.kt
index d06a82755e..85cd5c2eae 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/LoadingFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/LoadingFragment.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home
+package im.vector.riotx.features.home
 
 import android.graphics.drawable.AnimationDrawable
 import android.os.Bundle
 import android.view.View
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.platform.VectorBaseFragment
+import im.vector.riotx.R
+import im.vector.riotx.core.platform.VectorBaseFragment
 import kotlinx.android.synthetic.main.fragment_loading.*
 
 class LoadingFragment : VectorBaseFragment() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/PermalinkHandler.kt b/vector/src/main/java/im/vector/riotx/features/home/PermalinkHandler.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/features/home/PermalinkHandler.kt
rename to vector/src/main/java/im/vector/riotx/features/home/PermalinkHandler.kt
index 825e9748e9..c2148bcde8 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/PermalinkHandler.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/PermalinkHandler.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home
+package im.vector.riotx.features.home
 
 import android.content.Context
 import android.net.Uri
 import im.vector.matrix.android.api.permalinks.PermalinkData
 import im.vector.matrix.android.api.permalinks.PermalinkParser
 import im.vector.matrix.android.api.session.Session
-import im.vector.riotredesign.features.navigation.Navigator
+import im.vector.riotx.features.navigation.Navigator
 import javax.inject.Inject
 
 class PermalinkHandler @Inject constructor(private val session: Session,
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/UserColor.kt b/vector/src/main/java/im/vector/riotx/features/home/UserColor.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/features/home/UserColor.kt
rename to vector/src/main/java/im/vector/riotx/features/home/UserColor.kt
index bd3f60f477..ff05d98b01 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/UserColor.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/UserColor.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home
+package im.vector.riotx.features.home
 
 import androidx.annotation.ColorRes
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 
 @ColorRes
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListActions.kt b/vector/src/main/java/im/vector/riotx/features/home/group/GroupListActions.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListActions.kt
rename to vector/src/main/java/im/vector/riotx/features/home/group/GroupListActions.kt
index ea92cae84d..7c3a3f5665 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListActions.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/group/GroupListActions.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.group
+package im.vector.riotx.features.home.group
 
 import im.vector.matrix.android.api.session.group.model.GroupSummary
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/group/GroupListFragment.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/home/group/GroupListFragment.kt
index 568e849825..61e68dfb4b 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/group/GroupListFragment.kt
@@ -14,20 +14,19 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.group
+package im.vector.riotx.features.home.group
 
-import android.content.Context
 import android.os.Bundle
 import com.airbnb.mvrx.Incomplete
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.fragmentViewModel
 import im.vector.matrix.android.api.session.group.model.GroupSummary
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.extensions.observeEvent
-import im.vector.riotredesign.core.platform.StateView
-import im.vector.riotredesign.core.platform.VectorBaseFragment
-import im.vector.riotredesign.features.home.HomeNavigator
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.extensions.observeEvent
+import im.vector.riotx.core.platform.StateView
+import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.riotx.features.home.HomeNavigator
 import kotlinx.android.synthetic.main.fragment_group_list.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/group/GroupListViewModel.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/home/group/GroupListViewModel.kt
index fdb620985c..229652b0a5 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/group/GroupListViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.group
+package im.vector.riotx.features.home.group
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
@@ -27,10 +27,10 @@ import com.squareup.inject.assisted.AssistedInject
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.group.model.GroupSummary
 import im.vector.matrix.rx.rx
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.platform.VectorViewModel
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.core.utils.LiveEvent
+import im.vector.riotx.R
+import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.core.utils.LiveEvent
 
 const val ALL_COMMUNITIES_GROUP_ID = "ALL_COMMUNITIES_GROUP_ID"
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListViewState.kt b/vector/src/main/java/im/vector/riotx/features/home/group/GroupListViewState.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListViewState.kt
rename to vector/src/main/java/im/vector/riotx/features/home/group/GroupListViewState.kt
index 0ee8b09594..c86e9ef112 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListViewState.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/group/GroupListViewState.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.group
+package im.vector.riotx.features.home.group
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupSummaryController.kt b/vector/src/main/java/im/vector/riotx/features/home/group/GroupSummaryController.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/features/home/group/GroupSummaryController.kt
rename to vector/src/main/java/im/vector/riotx/features/home/group/GroupSummaryController.kt
index 02904be3be..785f833077 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupSummaryController.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/group/GroupSummaryController.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.group
+package im.vector.riotx.features.home.group
 
 import com.airbnb.epoxy.TypedEpoxyController
 import im.vector.matrix.android.api.session.group.model.GroupSummary
-import im.vector.riotredesign.features.home.AvatarRenderer
+import im.vector.riotx.features.home.AvatarRenderer
 import javax.inject.Inject
 
 class GroupSummaryController @Inject constructor(private val avatarRenderer: AvatarRenderer): TypedEpoxyController<GroupListViewState>() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupSummaryItem.kt b/vector/src/main/java/im/vector/riotx/features/home/group/GroupSummaryItem.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotredesign/features/home/group/GroupSummaryItem.kt
rename to vector/src/main/java/im/vector/riotx/features/home/group/GroupSummaryItem.kt
index 1abb59bd2a..d1dd55a3fc 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupSummaryItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/group/GroupSummaryItem.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.group
+package im.vector.riotx.features.home.group
 
 import android.widget.ImageView
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder
-import im.vector.riotredesign.core.epoxy.VectorEpoxyModel
-import im.vector.riotredesign.core.platform.CheckableConstraintLayout
-import im.vector.riotredesign.features.home.AvatarRenderer
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.riotx.core.platform.CheckableConstraintLayout
+import im.vector.riotx.features.home.AvatarRenderer
 
 @EpoxyModelClass(layout = R.layout.item_group)
 abstract class GroupSummaryItem : VectorEpoxyModel<GroupSummaryItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/group/SelectedGroupStore.kt b/vector/src/main/java/im/vector/riotx/features/home/group/SelectedGroupStore.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotredesign/features/home/group/SelectedGroupStore.kt
rename to vector/src/main/java/im/vector/riotx/features/home/group/SelectedGroupStore.kt
index 5bd0cc4eb7..a6291ecbb5 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/group/SelectedGroupStore.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/group/SelectedGroupStore.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.group
+package im.vector.riotx.features.home.group
 
 import arrow.core.Option
 import im.vector.matrix.android.api.session.group.model.GroupSummary
-import im.vector.riotredesign.core.utils.RxStore
+import im.vector.riotx.core.utils.RxStore
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/VisibleRoomStore.kt b/vector/src/main/java/im/vector/riotx/features/home/room/VisibleRoomStore.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/VisibleRoomStore.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/VisibleRoomStore.kt
index 6b2d60f69f..9805607c4c 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/VisibleRoomStore.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/VisibleRoomStore.kt
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room
+package im.vector.riotx.features.home.room
 
-import im.vector.riotredesign.core.utils.RxStore
+import im.vector.riotx.core.utils.RxStore
 
 class VisibleRoomStore : RxStore<String>()
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailActions.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailActions.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailActions.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailActions.kt
index 2cf066adb0..df5cfc96ff 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailActions.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailActions.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail
+package im.vector.riotx.features.home.room.detail
 
 import com.jaiselrahman.filepicker.model.MediaFile
 import im.vector.matrix.android.api.session.room.model.EditAggregatedSummary
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailActivity.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailActivity.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailActivity.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailActivity.kt
index a7de1cfb99..9108f5d08f 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailActivity.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail
+package im.vector.riotx.features.home.room.detail
 
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.widget.Toolbar
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.extensions.replaceFragment
-import im.vector.riotredesign.core.platform.ToolbarConfigurable
-import im.vector.riotredesign.core.platform.VectorBaseActivity
+import im.vector.riotx.R
+import im.vector.riotx.core.extensions.replaceFragment
+import im.vector.riotx.core.platform.ToolbarConfigurable
+import im.vector.riotx.core.platform.VectorBaseActivity
 
 class RoomDetailActivity : VectorBaseActivity(), ToolbarConfigurable {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
index 8c15900d92..32458f230c 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail
+package im.vector.riotx.features.home.room.detail
 
 import android.annotation.SuppressLint
 import android.app.Activity.RESULT_OK
@@ -60,51 +60,51 @@ import im.vector.matrix.android.api.session.room.model.Membership
 import im.vector.matrix.android.api.session.room.model.message.*
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
 import im.vector.matrix.android.api.session.user.model.User
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.dialogs.DialogListItem
-import im.vector.riotredesign.core.epoxy.LayoutManagerStateRestorer
-import im.vector.riotredesign.core.extensions.hideKeyboard
-import im.vector.riotredesign.core.extensions.observeEvent
-import im.vector.riotredesign.core.extensions.setTextOrHide
-import im.vector.riotredesign.core.glide.GlideApp
-import im.vector.riotredesign.core.platform.VectorBaseFragment
-import im.vector.riotredesign.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
-import im.vector.riotredesign.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
-import im.vector.riotredesign.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_NATIVE_CAMERA
-import im.vector.riotredesign.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_NATIVE_VIDEO_CAMERA
-import im.vector.riotredesign.core.utils.checkPermissions
-import im.vector.riotredesign.core.utils.copyToClipboard
-import im.vector.riotredesign.core.utils.openCamera
-import im.vector.riotredesign.core.utils.shareMedia
-import im.vector.riotredesign.features.autocomplete.command.AutocompleteCommandPresenter
-import im.vector.riotredesign.features.autocomplete.command.CommandAutocompletePolicy
-import im.vector.riotredesign.features.autocomplete.user.AutocompleteUserPresenter
-import im.vector.riotredesign.features.command.Command
-import im.vector.riotredesign.features.home.AvatarRenderer
-import im.vector.riotredesign.features.home.NavigateToRoomInterceptor
-import im.vector.riotredesign.features.home.PermalinkHandler
-import im.vector.riotredesign.features.home.getColorFromUserId
-import im.vector.riotredesign.features.home.room.detail.composer.TextComposerActions
-import im.vector.riotredesign.features.home.room.detail.composer.TextComposerView
-import im.vector.riotredesign.features.home.room.detail.composer.TextComposerViewModel
-import im.vector.riotredesign.features.home.room.detail.composer.TextComposerViewState
-import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController
-import im.vector.riotredesign.features.home.room.detail.timeline.action.ActionsHandler
-import im.vector.riotredesign.features.home.room.detail.timeline.action.MessageActionsBottomSheet
-import im.vector.riotredesign.features.home.room.detail.timeline.action.MessageMenuViewModel
-import im.vector.riotredesign.features.home.room.detail.timeline.action.ViewReactionBottomSheet
-import im.vector.riotredesign.features.home.room.detail.timeline.helper.EndlessRecyclerViewScrollListener
-import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData
-import im.vector.riotredesign.features.html.PillImageSpan
-import im.vector.riotredesign.features.invite.VectorInviteView
-import im.vector.riotredesign.features.media.ImageContentRenderer
-import im.vector.riotredesign.features.media.ImageMediaViewerActivity
-import im.vector.riotredesign.features.media.VideoContentRenderer
-import im.vector.riotredesign.features.media.VideoMediaViewerActivity
-import im.vector.riotredesign.features.notifications.NotificationDrawerManager
-import im.vector.riotredesign.features.reactions.EmojiReactionPickerActivity
-import im.vector.riotredesign.features.settings.PreferencesManager
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.dialogs.DialogListItem
+import im.vector.riotx.core.epoxy.LayoutManagerStateRestorer
+import im.vector.riotx.core.extensions.hideKeyboard
+import im.vector.riotx.core.extensions.observeEvent
+import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.riotx.core.glide.GlideApp
+import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.riotx.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
+import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
+import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_NATIVE_CAMERA
+import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_NATIVE_VIDEO_CAMERA
+import im.vector.riotx.core.utils.checkPermissions
+import im.vector.riotx.core.utils.copyToClipboard
+import im.vector.riotx.core.utils.openCamera
+import im.vector.riotx.core.utils.shareMedia
+import im.vector.riotx.features.autocomplete.command.AutocompleteCommandPresenter
+import im.vector.riotx.features.autocomplete.command.CommandAutocompletePolicy
+import im.vector.riotx.features.autocomplete.user.AutocompleteUserPresenter
+import im.vector.riotx.features.command.Command
+import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.riotx.features.home.NavigateToRoomInterceptor
+import im.vector.riotx.features.home.PermalinkHandler
+import im.vector.riotx.features.home.getColorFromUserId
+import im.vector.riotx.features.home.room.detail.composer.TextComposerActions
+import im.vector.riotx.features.home.room.detail.composer.TextComposerView
+import im.vector.riotx.features.home.room.detail.composer.TextComposerViewModel
+import im.vector.riotx.features.home.room.detail.composer.TextComposerViewState
+import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
+import im.vector.riotx.features.home.room.detail.timeline.action.ActionsHandler
+import im.vector.riotx.features.home.room.detail.timeline.action.MessageActionsBottomSheet
+import im.vector.riotx.features.home.room.detail.timeline.action.MessageMenuViewModel
+import im.vector.riotx.features.home.room.detail.timeline.action.ViewReactionBottomSheet
+import im.vector.riotx.features.home.room.detail.timeline.helper.EndlessRecyclerViewScrollListener
+import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
+import im.vector.riotx.features.html.PillImageSpan
+import im.vector.riotx.features.invite.VectorInviteView
+import im.vector.riotx.features.media.ImageContentRenderer
+import im.vector.riotx.features.media.ImageMediaViewerActivity
+import im.vector.riotx.features.media.VideoContentRenderer
+import im.vector.riotx.features.media.VideoMediaViewerActivity
+import im.vector.riotx.features.notifications.NotificationDrawerManager
+import im.vector.riotx.features.reactions.EmojiReactionPickerActivity
+import im.vector.riotx.features.settings.PreferencesManager
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.fragment_room_detail.*
 import kotlinx.android.synthetic.main.merge_composer_layout.view.*
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
index 7134110ddb..61cea3ccd5 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail
+package im.vector.riotx.features.home.room.detail
 
 import android.net.Uri
 import android.text.TextUtils
@@ -36,14 +36,14 @@ import im.vector.matrix.android.api.session.room.model.message.MessageContent
 import im.vector.matrix.android.api.session.room.model.message.MessageType
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
 import im.vector.matrix.rx.rx
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.intent.getFilenameFromUri
-import im.vector.riotredesign.core.platform.VectorViewModel
-import im.vector.riotredesign.core.resources.UserPreferencesProvider
-import im.vector.riotredesign.core.utils.LiveEvent
-import im.vector.riotredesign.features.command.CommandParser
-import im.vector.riotredesign.features.command.ParsedCommand
-import im.vector.riotredesign.features.home.room.detail.timeline.helper.TimelineDisplayableEvents
+import im.vector.riotx.R
+import im.vector.riotx.core.intent.getFilenameFromUri
+import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.riotx.core.resources.UserPreferencesProvider
+import im.vector.riotx.core.utils.LiveEvent
+import im.vector.riotx.features.command.CommandParser
+import im.vector.riotx.features.command.ParsedCommand
+import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineDisplayableEvents
 import io.reactivex.rxkotlin.subscribeBy
 import org.commonmark.parser.Parser
 import org.commonmark.renderer.html.HtmlRenderer
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailViewState.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewState.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailViewState.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewState.kt
index 3640860486..c32a79da37 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailViewState.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewState.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail
+package im.vector.riotx.features.home.room.detail
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/ScrollOnHighlightedEventCallback.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/ScrollOnHighlightedEventCallback.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/ScrollOnHighlightedEventCallback.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/ScrollOnHighlightedEventCallback.kt
index e9950fbb36..43828b0ee2 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/ScrollOnHighlightedEventCallback.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/ScrollOnHighlightedEventCallback.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail
+package im.vector.riotx.features.home.room.detail
 
 import androidx.recyclerview.widget.LinearLayoutManager
-import im.vector.riotredesign.core.platform.DefaultListUpdateCallback
-import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController
+import im.vector.riotx.core.platform.DefaultListUpdateCallback
+import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
 import java.util.concurrent.atomic.AtomicReference
 
 class ScrollOnHighlightedEventCallback(private val layoutManager: LinearLayoutManager,
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/ScrollOnNewMessageCallback.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/ScrollOnNewMessageCallback.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/ScrollOnNewMessageCallback.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/ScrollOnNewMessageCallback.kt
index 0888f6720b..8d3a96d8df 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/ScrollOnNewMessageCallback.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/ScrollOnNewMessageCallback.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail
+package im.vector.riotx.features.home.room.detail
 
 import androidx.recyclerview.widget.LinearLayoutManager
-import im.vector.riotredesign.core.platform.DefaultListUpdateCallback
+import im.vector.riotx.core.platform.DefaultListUpdateCallback
 
 class ScrollOnNewMessageCallback(private val layoutManager: LinearLayoutManager) : DefaultListUpdateCallback {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/SendMessageResult.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/SendMessageResult.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/SendMessageResult.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/SendMessageResult.kt
index 189ad90d88..ae7a470605 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/SendMessageResult.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/SendMessageResult.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail
+package im.vector.riotx.features.home.room.detail
 
-import im.vector.riotredesign.features.command.Command
+import im.vector.riotx.features.command.Command
 
 sealed class SendMessageResult {
     object MessageSent : SendMessageResult()
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/composer/TextComposerActions.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerActions.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/composer/TextComposerActions.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerActions.kt
index cb4e06c6f7..c36b80bdfe 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/composer/TextComposerActions.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerActions.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.composer
+package im.vector.riotx.features.home.room.detail.composer
 
 sealed class TextComposerActions {
     data class QueryUsers(val query: CharSequence?) : TextComposerActions()
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/composer/TextComposerView.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerView.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/composer/TextComposerView.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerView.kt
index 478839655e..488ecbd334 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/composer/TextComposerView.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerView.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.composer
+package im.vector.riotx.features.home.room.detail.composer
 
 import android.content.Context
 import android.util.AttributeSet
@@ -30,7 +30,7 @@ import androidx.transition.Transition
 import androidx.transition.TransitionManager
 import butterknife.BindView
 import butterknife.ButterKnife
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 
 /**
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/composer/TextComposerViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerViewModel.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/composer/TextComposerViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerViewModel.kt
index ef378a290c..8c3b675798 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/composer/TextComposerViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.composer
+package im.vector.riotx.features.home.room.detail.composer
 
 import arrow.core.Option
 import com.airbnb.mvrx.FragmentViewModelContext
@@ -26,8 +26,8 @@ import com.squareup.inject.assisted.AssistedInject
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.user.model.User
 import im.vector.matrix.rx.rx
-import im.vector.riotredesign.core.platform.VectorViewModel
-import im.vector.riotredesign.features.home.room.detail.RoomDetailFragment
+import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.riotx.features.home.room.detail.RoomDetailFragment
 import io.reactivex.Observable
 import io.reactivex.functions.BiFunction
 import java.util.concurrent.TimeUnit
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/composer/TextComposerViewState.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerViewState.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/composer/TextComposerViewState.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerViewState.kt
index e9317d71e8..57d5fc4993 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/composer/TextComposerViewState.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerViewState.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.composer
+package im.vector.riotx.features.home.room.detail.composer
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
 import im.vector.matrix.android.api.session.user.model.User
-import im.vector.riotredesign.features.home.room.detail.RoomDetailArgs
+import im.vector.riotx.features.home.room.detail.RoomDetailArgs
 
 
 data class TextComposerViewState(val roomId: String,
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventController.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventController.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventController.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventController.kt
index 72f73cd53d..f7e9d89b5b 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventController.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventController.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline
+package im.vector.riotx.features.home.room.detail.timeline
 
 import android.os.Handler
 import android.os.Looper
@@ -28,18 +28,18 @@ import im.vector.matrix.android.api.session.room.model.EditAggregatedSummary
 import im.vector.matrix.android.api.session.room.model.message.*
 import im.vector.matrix.android.api.session.room.timeline.Timeline
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.riotredesign.core.epoxy.LoadingItem_
-import im.vector.riotredesign.core.extensions.localDateTime
-import im.vector.riotredesign.core.resources.UserPreferencesProvider
-import im.vector.riotredesign.features.home.AvatarRenderer
-import im.vector.riotredesign.features.home.room.detail.timeline.factory.TimelineItemFactory
-import im.vector.riotredesign.features.home.room.detail.timeline.helper.*
-import im.vector.riotredesign.features.home.room.detail.timeline.item.DaySeparatorItem
-import im.vector.riotredesign.features.home.room.detail.timeline.item.DaySeparatorItem_
-import im.vector.riotredesign.features.home.room.detail.timeline.item.MergedHeaderItem
-import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData
-import im.vector.riotredesign.features.media.ImageContentRenderer
-import im.vector.riotredesign.features.media.VideoContentRenderer
+import im.vector.riotx.core.epoxy.LoadingItem_
+import im.vector.riotx.core.extensions.localDateTime
+import im.vector.riotx.core.resources.UserPreferencesProvider
+import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.riotx.features.home.room.detail.timeline.factory.TimelineItemFactory
+import im.vector.riotx.features.home.room.detail.timeline.helper.*
+import im.vector.riotx.features.home.room.detail.timeline.item.DaySeparatorItem
+import im.vector.riotx.features.home.room.detail.timeline.item.DaySeparatorItem_
+import im.vector.riotx.features.home.room.detail.timeline.item.MergedHeaderItem
+import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
+import im.vector.riotx.features.media.ImageContentRenderer
+import im.vector.riotx.features.media.VideoContentRenderer
 import org.threeten.bp.LocalDateTime
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventControllerHandler.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventControllerHandler.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventControllerHandler.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventControllerHandler.kt
index 7ac38d9700..5af7df86c1 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventControllerHandler.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventControllerHandler.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline
+package im.vector.riotx.features.home.room.detail.timeline
 
 import javax.inject.Qualifier
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ActionsHandler.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ActionsHandler.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ActionsHandler.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ActionsHandler.kt
index 1755fe6b05..6ad47bfe69 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ActionsHandler.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ActionsHandler.kt
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.home.room.detail.timeline.action
+package im.vector.riotx.features.home.room.detail.timeline.action
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import im.vector.riotredesign.core.utils.LiveEvent
+import im.vector.riotx.core.utils.LiveEvent
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt
index 391a680e16..1b39b1b706 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.home.room.detail.timeline.action
+package im.vector.riotx.features.home.room.detail.timeline.action
 
 import android.app.Dialog
 import android.os.Bundle
@@ -32,10 +32,10 @@ import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.features.home.AvatarRenderer
-import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
 import kotlinx.android.synthetic.main.bottom_sheet_message_actions.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
index 58c8cf61ac..f8b88e7028 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.home.room.detail.timeline.action
+package im.vector.riotx.features.home.room.detail.timeline.action
 
 import com.airbnb.mvrx.*
 import com.squareup.inject.assisted.Assisted
@@ -26,10 +26,10 @@ import im.vector.matrix.android.api.session.room.model.message.MessageTextConten
 import im.vector.matrix.android.api.session.room.model.message.MessageType
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
 import im.vector.matrix.rx.RxRoom
-import im.vector.riotredesign.core.platform.VectorViewModel
-import im.vector.riotredesign.features.home.room.detail.timeline.format.NoticeEventFormatter
-import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData
-import im.vector.riotredesign.features.html.EventHtmlRenderer
+import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.riotx.features.home.room.detail.timeline.format.NoticeEventFormatter
+import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
+import im.vector.riotx.features.html.EventHtmlRenderer
 import java.text.SimpleDateFormat
 import java.util.*
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageMenuFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageMenuFragment.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageMenuFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageMenuFragment.kt
index 4c8bc2c5f9..0c22091f74 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageMenuFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageMenuFragment.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.home.room.detail.timeline.action
+package im.vector.riotx.features.home.room.detail.timeline.action
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -26,10 +26,10 @@ import android.widget.TextView
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.platform.VectorBaseFragment
-import im.vector.riotredesign.features.themes.ThemeUtils
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.riotx.features.themes.ThemeUtils
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageMenuViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageMenuViewModel.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageMenuViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageMenuViewModel.kt
index 776d4cd523..c8accc8ee6 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageMenuViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageMenuViewModel.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.home.room.detail.timeline.action
+package im.vector.riotx.features.home.room.detail.timeline.action
 
 import com.airbnb.mvrx.*
 import com.squareup.inject.assisted.Assisted
@@ -28,11 +28,11 @@ import im.vector.matrix.android.api.session.room.model.message.MessageType
 import im.vector.matrix.android.api.session.room.send.SendState
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
 import im.vector.matrix.rx.RxRoom
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.platform.VectorViewModel
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.core.utils.isSingleEmoji
-import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData
+import im.vector.riotx.R
+import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.core.utils.isSingleEmoji
+import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
 import org.json.JSONObject
 
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/QuickReactionFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/QuickReactionFragment.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/QuickReactionFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/QuickReactionFragment.kt
index d5d6423194..fb731ce2ea 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/QuickReactionFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/QuickReactionFragment.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.home.room.detail.timeline.action
+package im.vector.riotx.features.home.room.detail.timeline.action
 
 import android.graphics.Typeface
 import android.os.Bundle
@@ -22,10 +22,10 @@ import android.widget.TextView
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotredesign.EmojiCompatFontProvider
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.platform.VectorBaseFragment
+import im.vector.riotx.EmojiCompatFontProvider
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.platform.VectorBaseFragment
 import kotlinx.android.synthetic.main.adapter_item_action_quick_reaction.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/QuickReactionViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/QuickReactionViewModel.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/QuickReactionViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/QuickReactionViewModel.kt
index 3d634fe8e2..d2a86f43a0 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/QuickReactionViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/QuickReactionViewModel.kt
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.home.room.detail.timeline.action
+package im.vector.riotx.features.home.room.detail.timeline.action
 
 import com.airbnb.mvrx.*
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.rx.RxRoom
-import im.vector.riotredesign.core.platform.VectorViewModel
-import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData
+import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
 
 /**
  * Quick reactions state, it's a toggle with 3rd state
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ReactionInfoSimpleItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ReactionInfoSimpleItem.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ReactionInfoSimpleItem.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ReactionInfoSimpleItem.kt
index 27e4c91c3f..10c2357d4f 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ReactionInfoSimpleItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ReactionInfoSimpleItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.action
+package im.vector.riotx.features.home.room.detail.timeline.action
 
 import android.graphics.Typeface
 import android.widget.TextView
@@ -22,8 +22,8 @@ import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.VectorEpoxyHolder
 
 /**
  * Item displaying an emoji reaction (single line with emoji, author, time)
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt
index b0104461f0..e6ac3a63e9 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.action
+package im.vector.riotx.features.home.room.detail.timeline.action
 
 import android.os.Parcelable
-import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData
+import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
 import kotlinx.android.parcel.Parcelize
 
 @Parcelize
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/VectorBaseBottomSheetDialogFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/VectorBaseBottomSheetDialogFragment.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/VectorBaseBottomSheetDialogFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/VectorBaseBottomSheetDialogFragment.kt
index 54b518bcbf..6e279ec90d 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/VectorBaseBottomSheetDialogFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/VectorBaseBottomSheetDialogFragment.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.home.room.detail.timeline.action
+package im.vector.riotx.features.home.room.detail.timeline.action
 
 import android.content.Context
 import android.os.Bundle
@@ -22,9 +22,9 @@ import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.MvRxView
 import com.airbnb.mvrx.MvRxViewModelStore
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import im.vector.riotredesign.core.di.DaggerScreenComponent
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.platform.VectorBaseActivity
+import im.vector.riotx.core.di.DaggerScreenComponent
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.platform.VectorBaseActivity
 import java.util.*
 
 /**
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ViewReactionBottomSheet.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ViewReactionBottomSheet.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ViewReactionBottomSheet.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ViewReactionBottomSheet.kt
index 3aabaeb3c1..760b74daf6 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ViewReactionBottomSheet.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ViewReactionBottomSheet.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.action
+package im.vector.riotx.features.home.room.detail.timeline.action
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -29,10 +29,10 @@ import com.airbnb.epoxy.EpoxyRecyclerView
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotredesign.EmojiCompatFontProvider
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData
+import im.vector.riotx.EmojiCompatFontProvider
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
 import kotlinx.android.synthetic.main.bottom_sheet_display_reactions.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ViewReactionViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ViewReactionViewModel.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ViewReactionViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ViewReactionViewModel.kt
index 3cfb4097bb..6f5a784742 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ViewReactionViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ViewReactionViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.action
+package im.vector.riotx.features.home.room.detail.timeline.action
 
 import com.airbnb.mvrx.*
 import com.squareup.inject.assisted.Assisted
@@ -22,10 +22,10 @@ import com.squareup.inject.assisted.AssistedInject
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.room.model.ReactionAggregatedSummary
 import im.vector.matrix.rx.RxRoom
-import im.vector.riotredesign.core.extensions.localDateTime
-import im.vector.riotredesign.core.platform.VectorViewModel
-import im.vector.riotredesign.core.utils.isSingleEmoji
-import im.vector.riotredesign.features.home.room.detail.timeline.helper.TimelineDateFormatter
+import im.vector.riotx.core.extensions.localDateTime
+import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.riotx.core.utils.isSingleEmoji
+import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineDateFormatter
 import io.reactivex.Observable
 import io.reactivex.Single
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ViewReactionsEpoxyController.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ViewReactionsEpoxyController.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ViewReactionsEpoxyController.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ViewReactionsEpoxyController.kt
index 3a9dcb2069..57c3d26528 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ViewReactionsEpoxyController.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ViewReactionsEpoxyController.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.action
+package im.vector.riotx.features.home.room.detail.timeline.action
 
 import android.graphics.Typeface
 import com.airbnb.epoxy.TypedEpoxyController
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt
index 94fe199c03..b54ee335fb 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.animation
+package im.vector.riotx.features.home.room.detail.timeline.animation
 
 import androidx.recyclerview.widget.DefaultItemAnimator
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/DefaultItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/DefaultItemFactory.kt
similarity index 83%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/DefaultItemFactory.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/DefaultItemFactory.kt
index f3782380e9..05e4007e04 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/DefaultItemFactory.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/DefaultItemFactory.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.factory
+package im.vector.riotx.features.home.room.detail.timeline.factory
 
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.riotredesign.features.home.room.detail.timeline.item.DefaultItem
-import im.vector.riotredesign.features.home.room.detail.timeline.item.DefaultItem_
+import im.vector.riotx.features.home.room.detail.timeline.item.DefaultItem
+import im.vector.riotx.features.home.room.detail.timeline.item.DefaultItem_
 import javax.inject.Inject
 
 class DefaultItemFactory @Inject constructor(){
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
similarity index 82%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
index 3f17052760..54c15685a9 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.factory
+package im.vector.riotx.features.home.room.detail.timeline.factory
 
 import android.view.View
 import im.vector.matrix.android.api.session.crypto.MXCryptoError
 import im.vector.matrix.android.api.session.events.model.EventType
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.VectorEpoxyModel
-import im.vector.riotredesign.core.resources.ColorProvider
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.core.utils.DebouncedClickListener
-import im.vector.riotredesign.features.home.AvatarRenderer
-import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController
-import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageTextItem_
-import im.vector.riotredesign.features.home.room.detail.timeline.item.NoticeItem_
-import im.vector.riotredesign.features.home.room.detail.timeline.util.MessageInformationDataFactory
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.riotx.core.resources.ColorProvider
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.core.utils.DebouncedClickListener
+import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
+import im.vector.riotx.features.home.room.detail.timeline.item.MessageTextItem_
+import im.vector.riotx.features.home.room.detail.timeline.item.NoticeItem_
+import im.vector.riotx.features.home.room.detail.timeline.util.MessageInformationDataFactory
 import me.gujun.android.span.span
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
similarity index 76%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
index b221672991..ea7036b741 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.factory
+package im.vector.riotx.features.home.room.detail.timeline.factory
 
 import im.vector.matrix.android.api.session.events.model.Event
 import im.vector.matrix.android.api.session.events.model.EventType
 import im.vector.matrix.android.api.session.events.model.toModel
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
 import im.vector.matrix.android.internal.crypto.model.event.EncryptionEventContent
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.features.home.AvatarRenderer
-import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController
-import im.vector.riotredesign.features.home.room.detail.timeline.helper.senderAvatar
-import im.vector.riotredesign.features.home.room.detail.timeline.helper.senderName
-import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData
-import im.vector.riotredesign.features.home.room.detail.timeline.item.NoticeItem
-import im.vector.riotredesign.features.home.room.detail.timeline.item.NoticeItem_
+import im.vector.riotx.R
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
+import im.vector.riotx.features.home.room.detail.timeline.helper.senderAvatar
+import im.vector.riotx.features.home.room.detail.timeline.helper.senderName
+import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
+import im.vector.riotx.features.home.room.detail.timeline.item.NoticeItem
+import im.vector.riotx.features.home.room.detail.timeline.item.NoticeItem_
 import javax.inject.Inject
 
 class EncryptionItemFactory @Inject constructor(private val stringProvider: StringProvider,
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/MessageItemFactory.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt
index 4bb900d1b7..f98bcc3253 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/MessageItemFactory.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.factory
+package im.vector.riotx.features.home.room.detail.timeline.factory
 
 import android.text.SpannableStringBuilder
 import android.text.Spanned
@@ -32,22 +32,22 @@ import im.vector.matrix.android.api.session.room.model.message.*
 import im.vector.matrix.android.api.session.room.send.SendState
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
 import im.vector.matrix.android.internal.crypto.attachments.toElementToDecrypt
-import im.vector.riotredesign.EmojiCompatFontProvider
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.VectorEpoxyModel
-import im.vector.riotredesign.core.linkify.VectorLinkify
-import im.vector.riotredesign.core.resources.ColorProvider
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.core.utils.DebouncedClickListener
-import im.vector.riotredesign.features.home.AvatarRenderer
-import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController
-import im.vector.riotredesign.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
-import im.vector.riotredesign.features.home.room.detail.timeline.helper.TimelineMediaSizeProvider
-import im.vector.riotredesign.features.home.room.detail.timeline.item.*
-import im.vector.riotredesign.features.home.room.detail.timeline.util.MessageInformationDataFactory
-import im.vector.riotredesign.features.html.EventHtmlRenderer
-import im.vector.riotredesign.features.media.ImageContentRenderer
-import im.vector.riotredesign.features.media.VideoContentRenderer
+import im.vector.riotx.EmojiCompatFontProvider
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.riotx.core.linkify.VectorLinkify
+import im.vector.riotx.core.resources.ColorProvider
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.core.utils.DebouncedClickListener
+import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
+import im.vector.riotx.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
+import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineMediaSizeProvider
+import im.vector.riotx.features.home.room.detail.timeline.item.*
+import im.vector.riotx.features.home.room.detail.timeline.util.MessageInformationDataFactory
+import im.vector.riotx.features.html.EventHtmlRenderer
+import im.vector.riotx.features.media.ImageContentRenderer
+import im.vector.riotx.features.media.VideoContentRenderer
 import me.gujun.android.span.span
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/NoticeItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
similarity index 69%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
index 2c8e8d522b..c23fdfbd7b 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.factory
+package im.vector.riotx.features.home.room.detail.timeline.factory
 
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.riotredesign.features.home.AvatarRenderer
-import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController
-import im.vector.riotredesign.features.home.room.detail.timeline.format.NoticeEventFormatter
-import im.vector.riotredesign.features.home.room.detail.timeline.helper.senderAvatar
-import im.vector.riotredesign.features.home.room.detail.timeline.helper.senderName
-import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData
-import im.vector.riotredesign.features.home.room.detail.timeline.item.NoticeItem
-import im.vector.riotredesign.features.home.room.detail.timeline.item.NoticeItem_
+import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
+import im.vector.riotx.features.home.room.detail.timeline.format.NoticeEventFormatter
+import im.vector.riotx.features.home.room.detail.timeline.helper.senderAvatar
+import im.vector.riotx.features.home.room.detail.timeline.helper.senderName
+import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
+import im.vector.riotx.features.home.room.detail.timeline.item.NoticeItem
+import im.vector.riotx.features.home.room.detail.timeline.item.NoticeItem_
 import javax.inject.Inject
 
 class NoticeItemFactory @Inject constructor(private val eventFormatter: NoticeEventFormatter,
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/TimelineItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
index 84f4f287e5..cb9d354b3c 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.factory
+package im.vector.riotx.features.home.room.detail.timeline.factory
 
 import im.vector.matrix.android.api.session.events.model.EventType
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.riotredesign.core.epoxy.EmptyItem_
-import im.vector.riotredesign.core.epoxy.VectorEpoxyModel
-import im.vector.riotredesign.features.home.AvatarRenderer
-import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController
-import im.vector.riotredesign.features.home.room.detail.timeline.helper.senderAvatar
-import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData
-import im.vector.riotredesign.features.home.room.detail.timeline.item.NoticeItem_
+import im.vector.riotx.core.epoxy.EmptyItem_
+import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
+import im.vector.riotx.features.home.room.detail.timeline.helper.senderAvatar
+import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
+import im.vector.riotx.features.home.room.detail.timeline.item.NoticeItem_
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
index 1408f7c7c5..369af64ae2 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.format
+package im.vector.riotx.features.home.room.detail.timeline.format
 
 import android.text.TextUtils
 import im.vector.matrix.android.api.session.events.model.Event
@@ -23,9 +23,9 @@ import im.vector.matrix.android.api.session.events.model.toModel
 import im.vector.matrix.android.api.session.room.model.*
 import im.vector.matrix.android.api.session.room.model.call.CallInviteContent
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.features.home.room.detail.timeline.helper.senderName
+import im.vector.riotx.R
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.features.home.room.detail.timeline.helper.senderName
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
index 3707eee0a2..fa4f05f1ec 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.helper
+package im.vector.riotx.features.home.room.detail.timeline.helper
 
 import android.content.Context
 import android.text.format.Formatter
@@ -23,9 +23,9 @@ import android.view.ViewGroup
 import android.widget.ProgressBar
 import android.widget.TextView
 import im.vector.matrix.android.api.session.content.ContentUploadStateTracker
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.features.media.ImageContentRenderer
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.features.media.ImageContentRenderer
 import java.io.File
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/EndlessRecyclerViewScrollListener.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/EndlessRecyclerViewScrollListener.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/EndlessRecyclerViewScrollListener.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/EndlessRecyclerViewScrollListener.kt
index d078e72c80..9bcb7c634f 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/EndlessRecyclerViewScrollListener.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/EndlessRecyclerViewScrollListener.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.helper
+package im.vector.riotx.features.home.room.detail.timeline.helper
 
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt
index 31bddf023e..24bdd0ff6c 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.helper
+package im.vector.riotx.features.home.room.detail.timeline.helper
 
 import android.os.Handler
 import android.os.HandlerThread
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineDateFormatter.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineDateFormatter.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineDateFormatter.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineDateFormatter.kt
index bd2b630f4d..a1104e3285 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineDateFormatter.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineDateFormatter.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.helper
+package im.vector.riotx.features.home.room.detail.timeline.helper
 
-import im.vector.riotredesign.core.resources.LocaleProvider
+import im.vector.riotx.core.resources.LocaleProvider
 import org.threeten.bp.LocalDateTime
 import org.threeten.bp.format.DateTimeFormatter
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
index 871edf3750..667de65a4b 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.helper
+package im.vector.riotx.features.home.room.detail.timeline.helper
 
 import im.vector.matrix.android.api.session.events.model.EventType
 import im.vector.matrix.android.api.session.events.model.RelationType
@@ -22,7 +22,7 @@ import im.vector.matrix.android.api.session.events.model.toModel
 import im.vector.matrix.android.api.session.room.model.RoomMember
 import im.vector.matrix.android.api.session.room.model.message.MessageContent
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.riotredesign.core.extensions.localDateTime
+import im.vector.riotx.core.extensions.localDateTime
 
 object TimelineDisplayableEvents {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt
index cd62b511f3..9c53ee9935 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.helper
+package im.vector.riotx.features.home.room.detail.timeline.helper
 
 import androidx.recyclerview.widget.DiffUtil
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineEventVisibilityStateChangedListener.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineEventVisibilityStateChangedListener.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineEventVisibilityStateChangedListener.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineEventVisibilityStateChangedListener.kt
index 0b39bdf57c..95d9b6f43b 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineEventVisibilityStateChangedListener.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineEventVisibilityStateChangedListener.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.helper
+package im.vector.riotx.features.home.room.detail.timeline.helper
 
 import com.airbnb.epoxy.VisibilityState
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.riotredesign.core.epoxy.VectorEpoxyModel
-import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController
+import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
 
 class TimelineEventVisibilityStateChangedListener(private val callback: TimelineEventController.Callback?,
                                                   private val event: TimelineEvent)
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt
index 6d985ae604..532e766142 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.helper
+package im.vector.riotx.features.home.room.detail.timeline.helper
 
 import androidx.recyclerview.widget.RecyclerView
-import im.vector.riotredesign.core.di.ScreenScope
+import im.vector.riotx.core.di.ScreenScope
 import javax.inject.Inject
 
 @ScreenScope
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/AbsMessageItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/AbsMessageItem.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt
index aeafcb18da..7a66c6adcf 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/AbsMessageItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.item
+package im.vector.riotx.features.home.room.detail.timeline.item
 
 import android.graphics.Typeface
 import android.os.Build
@@ -28,12 +28,12 @@ import androidx.core.view.children
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.utils.DebouncedClickListener
-import im.vector.riotredesign.core.utils.DimensionUtils.dpToPx
-import im.vector.riotredesign.features.home.AvatarRenderer
-import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController
-import im.vector.riotredesign.features.reactions.widget.ReactionButton
+import im.vector.riotx.R
+import im.vector.riotx.core.utils.DebouncedClickListener
+import im.vector.riotx.core.utils.DimensionUtils.dpToPx
+import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
+import im.vector.riotx.features.reactions.widget.ReactionButton
 
 
 abstract class AbsMessageItem<H : AbsMessageItem.Holder> : BaseEventItem<H>() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/BaseEventItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BaseEventItem.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/BaseEventItem.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BaseEventItem.kt
index 45da881fe1..3a7d09e20d 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/BaseEventItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BaseEventItem.kt
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.home.room.detail.timeline.item
+package im.vector.riotx.features.home.room.detail.timeline.item
 
 import android.view.View
 import android.view.ViewStub
 import androidx.annotation.IdRes
 import androidx.constraintlayout.widget.Guideline
 import com.airbnb.epoxy.EpoxyAttribute
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder
-import im.vector.riotredesign.core.epoxy.VectorEpoxyModel
-import im.vector.riotredesign.core.platform.CheckableView
-import im.vector.riotredesign.core.utils.DimensionUtils.dpToPx
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.riotx.core.platform.CheckableView
+import im.vector.riotx.core.utils.DimensionUtils.dpToPx
 
 abstract class BaseEventItem<H : BaseEventItem.BaseHolder> : VectorEpoxyModel<H>() {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/BlankItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BlankItem.kt
similarity index 78%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/BlankItem.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BlankItem.kt
index 39ab2c4228..1b62c77b88 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/BlankItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BlankItem.kt
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.home.room.detail.timeline.item
+package im.vector.riotx.features.home.room.detail.timeline.item
 
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder
-import im.vector.riotredesign.core.epoxy.VectorEpoxyModel
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import im.vector.riotx.core.epoxy.VectorEpoxyModel
 
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_blank_stub)
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/DaySeparatorItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DaySeparatorItem.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/DaySeparatorItem.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DaySeparatorItem.kt
index 217c12c708..4966663332 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/DaySeparatorItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DaySeparatorItem.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.item
+package im.vector.riotx.features.home.room.detail.timeline.item
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.VectorEpoxyHolder
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_day_separator)
 abstract class DaySeparatorItem : EpoxyModelWithHolder<DaySeparatorItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/DefaultItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DefaultItem.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/DefaultItem.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DefaultItem.kt
index 443290d343..cc50493aea 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/DefaultItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DefaultItem.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.item
+package im.vector.riotx.features.home.room.detail.timeline.item
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base_noinfo)
 abstract class DefaultItem : BaseEventItem<DefaultItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MergedHeaderItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedHeaderItem.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MergedHeaderItem.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedHeaderItem.kt
index 275d357aa6..8a6c8683ed 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MergedHeaderItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedHeaderItem.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.item
+package im.vector.riotx.features.home.room.detail.timeline.item
 
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.view.children
-import im.vector.riotredesign.R
-import im.vector.riotredesign.features.home.AvatarRenderer
+import im.vector.riotx.R
+import im.vector.riotx.features.home.AvatarRenderer
 
 
 data class MergedHeaderItem(private val isCollapsed: Boolean,
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageFileItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageFileItem.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageFileItem.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageFileItem.kt
index 9ec8d08bc1..66b368dfd8 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageFileItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageFileItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.item
+package im.vector.riotx.features.home.room.detail.timeline.item
 
 import android.graphics.Paint
 import android.view.View
@@ -24,8 +24,8 @@ import android.widget.TextView
 import androidx.annotation.DrawableRes
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
-import im.vector.riotredesign.features.home.AvatarRenderer
+import im.vector.riotx.R
+import im.vector.riotx.features.home.AvatarRenderer
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base)
 abstract class MessageFileItem : AbsMessageItem<MessageFileItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageImageVideoItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
index 33bf57326b..67f0ed7bda 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.item
+package im.vector.riotx.features.home.room.detail.timeline.item
 
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
-import im.vector.riotredesign.features.home.AvatarRenderer
-import im.vector.riotredesign.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
-import im.vector.riotredesign.features.media.ImageContentRenderer
+import im.vector.riotx.R
+import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.riotx.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
+import im.vector.riotx.features.media.ImageContentRenderer
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base)
 abstract class MessageImageVideoItem : AbsMessageItem<MessageImageVideoItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageInformationData.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageInformationData.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageInformationData.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageInformationData.kt
index e7f4aa8295..5f49fdc360 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageInformationData.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageInformationData.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.item
+package im.vector.riotx.features.home.room.detail.timeline.item
 
 import android.os.Parcelable
 import im.vector.matrix.android.api.session.room.send.SendState
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageTextItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageTextItem.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageTextItem.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageTextItem.kt
index 8bf84011bf..ad69d104b5 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageTextItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageTextItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.item
+package im.vector.riotx.features.home.room.detail.timeline.item
 
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.core.text.PrecomputedTextCompat
@@ -22,11 +22,11 @@ import androidx.core.text.toSpannable
 import androidx.core.widget.TextViewCompat
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.utils.containsOnlyEmojis
-import im.vector.riotredesign.features.home.AvatarRenderer
-import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController
-import im.vector.riotredesign.features.html.PillImageSpan
+import im.vector.riotx.R
+import im.vector.riotx.core.utils.containsOnlyEmojis
+import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
+import im.vector.riotx.features.html.PillImageSpan
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/NoticeItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/NoticeItem.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/NoticeItem.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/NoticeItem.kt
index 35f1718604..0864535761 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/NoticeItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/NoticeItem.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.item
+package im.vector.riotx.features.home.room.detail.timeline.item
 
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
-import im.vector.riotredesign.features.home.AvatarRenderer
-import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController
+import im.vector.riotx.R
+import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base_noinfo)
 abstract class NoticeItem : BaseEventItem<NoticeItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/RedactedMessageItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RedactedMessageItem.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/RedactedMessageItem.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RedactedMessageItem.kt
index 76c38fa219..05967f0086 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/RedactedMessageItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RedactedMessageItem.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.item
+package im.vector.riotx.features.home.room.detail.timeline.item
 
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
-import im.vector.riotredesign.features.home.AvatarRenderer
+import im.vector.riotx.R
+import im.vector.riotx.features.home.AvatarRenderer
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base)
 abstract class RedactedMessageItem : AbsMessageItem<RedactedMessageItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/util/MessageInformationDataFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/util/MessageInformationDataFactory.kt
similarity index 84%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/util/MessageInformationDataFactory.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/util/MessageInformationDataFactory.kt
index 0f8a81c985..d17c8de62f 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/util/MessageInformationDataFactory.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/util/MessageInformationDataFactory.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.detail.timeline.util
+package im.vector.riotx.features.home.room.detail.timeline.util
 
 import im.vector.matrix.android.api.session.events.model.EventType
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.riotredesign.core.extensions.localDateTime
-import im.vector.riotredesign.core.resources.ColorProvider
-import im.vector.riotredesign.core.utils.isSingleEmoji
-import im.vector.riotredesign.features.home.getColorFromUserId
-import im.vector.riotredesign.features.home.room.detail.timeline.helper.TimelineDateFormatter
-import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData
-import im.vector.riotredesign.features.home.room.detail.timeline.item.ReactionInfoData
+import im.vector.riotx.core.extensions.localDateTime
+import im.vector.riotx.core.resources.ColorProvider
+import im.vector.riotx.core.utils.isSingleEmoji
+import im.vector.riotx.features.home.getColorFromUserId
+import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineDateFormatter
+import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
+import im.vector.riotx.features.home.room.detail.timeline.item.ReactionInfoData
 import me.gujun.android.span.span
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/AlphabeticalRoomComparator.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/AlphabeticalRoomComparator.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/AlphabeticalRoomComparator.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/list/AlphabeticalRoomComparator.kt
index 1c86d9083c..e69195b3ed 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/AlphabeticalRoomComparator.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/AlphabeticalRoomComparator.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.list
+package im.vector.riotx.features.home.room.list
 
 import im.vector.matrix.android.api.session.room.model.RoomSummary
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/ChronologicalRoomComparator.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/ChronologicalRoomComparator.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/ChronologicalRoomComparator.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/list/ChronologicalRoomComparator.kt
index 282590656a..c4a1633bed 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/ChronologicalRoomComparator.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/ChronologicalRoomComparator.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.list
+package im.vector.riotx.features.home.room.list
 
 import im.vector.matrix.android.api.session.room.model.RoomSummary
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomCategoryItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomCategoryItem.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomCategoryItem.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/list/RoomCategoryItem.kt
index ef021938ee..7c1553dfa4 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomCategoryItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomCategoryItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.list
+package im.vector.riotx.features.home.room.list
 
 import android.view.ViewGroup
 import android.widget.TextView
@@ -22,10 +22,10 @@ import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder
-import im.vector.riotredesign.core.epoxy.VectorEpoxyModel
-import im.vector.riotredesign.features.themes.ThemeUtils
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.riotx.features.themes.ThemeUtils
 
 @EpoxyModelClass(layout = R.layout.item_room_category)
 abstract class RoomCategoryItem : VectorEpoxyModel<RoomCategoryItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomInvitationItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomInvitationItem.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomInvitationItem.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/list/RoomInvitationItem.kt
index 0da7de1839..e944816ea9 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomInvitationItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomInvitationItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.list
+package im.vector.riotx.features.home.room.list
 
 import android.view.ViewGroup
 import android.widget.ImageView
@@ -22,12 +22,12 @@ import android.widget.TextView
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder
-import im.vector.riotredesign.core.epoxy.VectorEpoxyModel
-import im.vector.riotredesign.core.extensions.setTextOrHide
-import im.vector.riotredesign.core.platform.ButtonStateView
-import im.vector.riotredesign.features.home.AvatarRenderer
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.riotx.core.platform.ButtonStateView
+import im.vector.riotx.features.home.AvatarRenderer
 
 
 @EpoxyModelClass(layout = R.layout.item_room_invitation)
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListActions.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListActions.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListActions.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListActions.kt
index 4c5d57df3a..d501936596 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListActions.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListActions.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.list
+package im.vector.riotx.features.home.room.list
 
 import im.vector.matrix.android.api.session.room.model.RoomSummary
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListAnimator.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListAnimator.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListAnimator.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListAnimator.kt
index 687f5ac5c2..53aa52361b 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListAnimator.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListAnimator.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.list
+package im.vector.riotx.features.home.room.list
 
 import androidx.recyclerview.widget.DefaultItemAnimator
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListDisplayModeFilter.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListDisplayModeFilter.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListDisplayModeFilter.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListDisplayModeFilter.kt
index 958c431a6d..96fad483b4 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListDisplayModeFilter.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListDisplayModeFilter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.list
+package im.vector.riotx.features.home.room.list
 
 import im.vector.matrix.android.api.session.room.model.Membership
 import im.vector.matrix.android.api.session.room.model.RoomSummary
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListFragment.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListFragment.kt
index 1b2a3650e7..f417033b19 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.list
+package im.vector.riotx.features.home.room.list
 
 import android.os.Bundle
 import android.os.Parcelable
@@ -28,16 +28,16 @@ import com.google.android.material.snackbar.Snackbar
 import im.vector.matrix.android.api.failure.Failure
 import im.vector.matrix.android.api.session.room.model.Membership
 import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.epoxy.LayoutManagerStateRestorer
-import im.vector.riotredesign.core.error.ErrorFormatter
-import im.vector.riotredesign.core.extensions.observeEvent
-import im.vector.riotredesign.core.extensions.observeEventDebounced
-import im.vector.riotredesign.core.platform.OnBackPressed
-import im.vector.riotredesign.core.platform.StateView
-import im.vector.riotredesign.core.platform.VectorBaseFragment
-import im.vector.riotredesign.features.home.room.list.widget.FabMenuView
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.epoxy.LayoutManagerStateRestorer
+import im.vector.riotx.core.error.ErrorFormatter
+import im.vector.riotx.core.extensions.observeEvent
+import im.vector.riotx.core.extensions.observeEventDebounced
+import im.vector.riotx.core.platform.OnBackPressed
+import im.vector.riotx.core.platform.StateView
+import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.riotx.features.home.room.list.widget.FabMenuView
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.fragment_room_list.*
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModel.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModel.kt
index 7cd49fd56c..6b814bb94e 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.list
+package im.vector.riotx.features.home.room.list
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
@@ -28,9 +28,9 @@ import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.room.model.Membership
 import im.vector.matrix.android.api.session.room.model.RoomSummary
 import im.vector.matrix.android.api.session.room.model.tag.RoomTag
-import im.vector.riotredesign.core.platform.VectorViewModel
-import im.vector.riotredesign.core.utils.LiveEvent
-import im.vector.riotredesign.features.home.HomeRoomListObservableStore
+import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.riotx.core.utils.LiveEvent
+import im.vector.riotx.features.home.HomeRoomListObservableStore
 import timber.log.Timber
 
 class RoomListViewModel @AssistedInject constructor(@Assisted initialState: RoomListViewState,
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListViewState.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewState.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListViewState.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewState.kt
index c56e1b6c17..aa03c98a31 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListViewState.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewState.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.list
+package im.vector.riotx.features.home.room.list
 
 import androidx.annotation.StringRes
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
 import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 data class RoomListViewState(
         val displayMode: RoomListFragment.DisplayMode,
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryController.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryController.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt
index f258ed79e9..ca9fc82e3c 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryController.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.list
+package im.vector.riotx.features.home.room.list
 
 import androidx.annotation.StringRes
 import com.airbnb.epoxy.TypedEpoxyController
 import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.riotredesign.core.resources.StringProvider
+import im.vector.riotx.core.resources.StringProvider
 import javax.inject.Inject
 
 class RoomSummaryController @Inject constructor(private val stringProvider: StringProvider,
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryFormatter.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryFormatter.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryFormatter.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryFormatter.kt
index a6463e3739..860852819f 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryFormatter.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryFormatter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.list
+package im.vector.riotx.features.home.room.list
 
 object RoomSummaryFormatter {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItem.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItem.kt
index 1207cb13b6..72f5b973fb 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItem.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.list
+package im.vector.riotx.features.home.room.list
 
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder
-import im.vector.riotredesign.core.epoxy.VectorEpoxyModel
-import im.vector.riotredesign.features.home.AvatarRenderer
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.riotx.features.home.AvatarRenderer
 
 
 @EpoxyModelClass(layout = R.layout.item_room)
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItemFactory.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItemFactory.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItemFactory.kt
index e846ebbbaf..05b366a605 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItemFactory.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItemFactory.kt
@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.list
+package im.vector.riotx.features.home.room.list
 
 import im.vector.matrix.android.api.session.events.model.EventType
 import im.vector.matrix.android.api.session.events.model.toModel
 import im.vector.matrix.android.api.session.room.model.Membership
 import im.vector.matrix.android.api.session.room.model.RoomSummary
 import im.vector.matrix.android.api.session.room.model.message.MessageContent
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.VectorEpoxyModel
-import im.vector.riotredesign.core.extensions.localDateTime
-import im.vector.riotredesign.core.resources.ColorProvider
-import im.vector.riotredesign.core.resources.DateProvider
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.features.home.AvatarRenderer
-import im.vector.riotredesign.features.home.room.detail.timeline.format.NoticeEventFormatter
-import im.vector.riotredesign.features.home.room.detail.timeline.helper.TimelineDateFormatter
-import im.vector.riotredesign.features.home.room.detail.timeline.helper.senderName
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.riotx.core.extensions.localDateTime
+import im.vector.riotx.core.resources.ColorProvider
+import im.vector.riotx.core.resources.DateProvider
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.riotx.features.home.room.detail.timeline.format.NoticeEventFormatter
+import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineDateFormatter
+import im.vector.riotx.features.home.room.detail.timeline.helper.senderName
 import me.gujun.android.span.span
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/UnreadCounterBadgeView.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/UnreadCounterBadgeView.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/UnreadCounterBadgeView.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/list/UnreadCounterBadgeView.kt
index 381fd0ec36..f2ba159158 100755
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/UnreadCounterBadgeView.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/UnreadCounterBadgeView.kt
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.home.room.list
+package im.vector.riotx.features.home.room.list
 
 import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import androidx.appcompat.widget.AppCompatTextView
-import im.vector.riotredesign.R
-import im.vector.riotredesign.features.themes.ThemeUtils
+import im.vector.riotx.R
+import im.vector.riotx.features.themes.ThemeUtils
 
 class UnreadCounterBadgeView : AppCompatTextView {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/widget/FabMenuView.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/widget/FabMenuView.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/widget/FabMenuView.kt
rename to vector/src/main/java/im/vector/riotx/features/home/room/list/widget/FabMenuView.kt
index 9210e7ac2e..32efca6632 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/widget/FabMenuView.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/widget/FabMenuView.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.home.room.list.widget
+package im.vector.riotx.features.home.room.list.widget
 
 import android.content.Context
 import android.util.AttributeSet
 import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.core.view.isVisible
 import com.google.android.material.floatingactionbutton.FloatingActionButton
-import im.vector.riotredesign.R
-import im.vector.riotredesign.features.themes.ThemeUtils
+import im.vector.riotx.R
+import im.vector.riotx.features.themes.ThemeUtils
 import kotlinx.android.synthetic.main.motion_fab_menu_merge.view.*
 
 class FabMenuView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null,
diff --git a/vector/src/main/java/im/vector/riotredesign/features/homeserver/ServerUrlsRepository.kt b/vector/src/main/java/im/vector/riotx/features/homeserver/ServerUrlsRepository.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/homeserver/ServerUrlsRepository.kt
rename to vector/src/main/java/im/vector/riotx/features/homeserver/ServerUrlsRepository.kt
index 2893dded74..37ac440021 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/homeserver/ServerUrlsRepository.kt
+++ b/vector/src/main/java/im/vector/riotx/features/homeserver/ServerUrlsRepository.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.homeserver
+package im.vector.riotx.features.homeserver
 
 import android.content.Context
 import android.text.TextUtils
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 /**
  * Object to store and retrieve home and identity server urls
diff --git a/vector/src/main/java/im/vector/riotredesign/features/html/EventHtmlRenderer.kt b/vector/src/main/java/im/vector/riotx/features/html/EventHtmlRenderer.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/html/EventHtmlRenderer.kt
rename to vector/src/main/java/im/vector/riotx/features/html/EventHtmlRenderer.kt
index fa755a1136..3e563b33dc 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/html/EventHtmlRenderer.kt
+++ b/vector/src/main/java/im/vector/riotx/features/html/EventHtmlRenderer.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.html
+package im.vector.riotx.features.html
 
 import android.content.Context
 import android.text.style.URLSpan
@@ -22,9 +22,9 @@ import androidx.appcompat.app.AppCompatActivity
 import im.vector.matrix.android.api.permalinks.PermalinkData
 import im.vector.matrix.android.api.permalinks.PermalinkParser
 import im.vector.matrix.android.api.session.Session
-import im.vector.riotredesign.core.glide.GlideApp
-import im.vector.riotredesign.core.glide.GlideRequests
-import im.vector.riotredesign.features.home.AvatarRenderer
+import im.vector.riotx.core.glide.GlideApp
+import im.vector.riotx.core.glide.GlideRequests
+import im.vector.riotx.features.home.AvatarRenderer
 import org.commonmark.node.BlockQuote
 import org.commonmark.node.HtmlBlock
 import org.commonmark.node.HtmlInline
diff --git a/vector/src/main/java/im/vector/riotredesign/features/html/FontTagHandler.kt b/vector/src/main/java/im/vector/riotx/features/html/FontTagHandler.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotredesign/features/html/FontTagHandler.kt
rename to vector/src/main/java/im/vector/riotx/features/html/FontTagHandler.kt
index f757155962..adaee21fa0 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/html/FontTagHandler.kt
+++ b/vector/src/main/java/im/vector/riotx/features/html/FontTagHandler.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.html
+package im.vector.riotx.features.html
 
 import android.graphics.Color
 import android.text.style.ForegroundColorSpan
diff --git a/vector/src/main/java/im/vector/riotredesign/features/html/PillImageSpan.kt b/vector/src/main/java/im/vector/riotx/features/html/PillImageSpan.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/features/html/PillImageSpan.kt
rename to vector/src/main/java/im/vector/riotx/features/html/PillImageSpan.kt
index c5939e6dd3..3f9e4b2b8c 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/html/PillImageSpan.kt
+++ b/vector/src/main/java/im/vector/riotx/features/html/PillImageSpan.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.html
+package im.vector.riotx.features.html
 
 import android.content.Context
 import android.graphics.Canvas
@@ -27,9 +27,9 @@ import com.bumptech.glide.request.target.SimpleTarget
 import com.bumptech.glide.request.transition.Transition
 import com.google.android.material.chip.ChipDrawable
 import im.vector.matrix.android.api.session.user.model.User
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.glide.GlideRequests
-import im.vector.riotredesign.features.home.AvatarRenderer
+import im.vector.riotx.R
+import im.vector.riotx.core.glide.GlideRequests
+import im.vector.riotx.features.home.AvatarRenderer
 import java.lang.ref.WeakReference
 
 /**
diff --git a/vector/src/main/java/im/vector/riotredesign/features/invite/VectorInviteView.kt b/vector/src/main/java/im/vector/riotx/features/invite/VectorInviteView.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotredesign/features/invite/VectorInviteView.kt
rename to vector/src/main/java/im/vector/riotx/features/invite/VectorInviteView.kt
index 15187a3281..29e98a027e 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/invite/VectorInviteView.kt
+++ b/vector/src/main/java/im/vector/riotx/features/invite/VectorInviteView.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.invite
+package im.vector.riotx.features.invite
 
 import android.content.Context
 import android.util.AttributeSet
@@ -22,9 +22,9 @@ import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.updateLayoutParams
 import im.vector.matrix.android.api.session.user.model.User
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.HasScreenInjector
-import im.vector.riotredesign.features.home.AvatarRenderer
+import im.vector.riotx.R
+import im.vector.riotx.core.di.HasScreenInjector
+import im.vector.riotx.features.home.AvatarRenderer
 import kotlinx.android.synthetic.main.vector_invite_view.view.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/lifecycle/VectorActivityLifecycleCallbacks.kt b/vector/src/main/java/im/vector/riotx/features/lifecycle/VectorActivityLifecycleCallbacks.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotredesign/features/lifecycle/VectorActivityLifecycleCallbacks.kt
rename to vector/src/main/java/im/vector/riotx/features/lifecycle/VectorActivityLifecycleCallbacks.kt
index b3ac5726a4..d6c7bbd9b3 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/lifecycle/VectorActivityLifecycleCallbacks.kt
+++ b/vector/src/main/java/im/vector/riotx/features/lifecycle/VectorActivityLifecycleCallbacks.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.lifecycle
+package im.vector.riotx.features.lifecycle
 
 import android.app.Activity
 import android.app.Application
 import android.os.Bundle
-import im.vector.riotredesign.features.popup.PopupAlertManager
+import im.vector.riotx.features.popup.PopupAlertManager
 import javax.inject.Inject
 
 class VectorActivityLifecycleCallbacks @Inject constructor() : Application.ActivityLifecycleCallbacks {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/login/LoginActivity.kt b/vector/src/main/java/im/vector/riotx/features/login/LoginActivity.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotredesign/features/login/LoginActivity.kt
rename to vector/src/main/java/im/vector/riotx/features/login/LoginActivity.kt
index 6ced7b27da..911bffb8b1 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/login/LoginActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/login/LoginActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.login
+package im.vector.riotx.features.login
 
 import android.content.Context
 import android.content.Intent
@@ -27,15 +27,15 @@ import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.auth.Authenticator
 import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig
 import im.vector.matrix.android.api.session.Session
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.extensions.configureAndStart
-import im.vector.riotredesign.core.extensions.showPassword
-import im.vector.riotredesign.core.platform.VectorBaseActivity
-import im.vector.riotredesign.features.disclaimer.showDisclaimerDialog
-import im.vector.riotredesign.features.home.HomeActivity
-import im.vector.riotredesign.features.notifications.PushRuleTriggerListener
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.extensions.configureAndStart
+import im.vector.riotx.core.extensions.showPassword
+import im.vector.riotx.core.platform.VectorBaseActivity
+import im.vector.riotx.features.disclaimer.showDisclaimerDialog
+import im.vector.riotx.features.home.HomeActivity
+import im.vector.riotx.features.notifications.PushRuleTriggerListener
 import io.reactivex.Observable
 import io.reactivex.functions.Function3
 import io.reactivex.rxkotlin.subscribeBy
diff --git a/vector/src/main/java/im/vector/riotredesign/features/media/DefaultImageLoaderCallback.kt b/vector/src/main/java/im/vector/riotx/features/media/DefaultImageLoaderCallback.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/features/media/DefaultImageLoaderCallback.kt
rename to vector/src/main/java/im/vector/riotx/features/media/DefaultImageLoaderCallback.kt
index 40bbad20e6..4485a60c57 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/media/DefaultImageLoaderCallback.kt
+++ b/vector/src/main/java/im/vector/riotx/features/media/DefaultImageLoaderCallback.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.media
+package im.vector.riotx.features.media
 
 import com.github.piasy.biv.loader.ImageLoader
 import java.io.File
diff --git a/vector/src/main/java/im/vector/riotredesign/features/media/ImageContentRenderer.kt b/vector/src/main/java/im/vector/riotx/features/media/ImageContentRenderer.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/media/ImageContentRenderer.kt
rename to vector/src/main/java/im/vector/riotx/features/media/ImageContentRenderer.kt
index 15b7e82fff..0f92cbffbe 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/media/ImageContentRenderer.kt
+++ b/vector/src/main/java/im/vector/riotx/features/media/ImageContentRenderer.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.media
+package im.vector.riotx.features.media
 
 import android.net.Uri
 import android.os.Parcelable
@@ -24,9 +24,9 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.github.piasy.biv.view.BigImageView
 import im.vector.matrix.android.api.session.content.ContentUrlResolver
 import im.vector.matrix.android.internal.crypto.attachments.ElementToDecrypt
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.core.glide.GlideApp
-import im.vector.riotredesign.core.utils.DimensionUtils.dpToPx
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.core.glide.GlideApp
+import im.vector.riotx.core.utils.DimensionUtils.dpToPx
 import kotlinx.android.parcel.Parcelize
 import java.io.File
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotredesign/features/media/ImageMediaViewerActivity.kt b/vector/src/main/java/im/vector/riotx/features/media/ImageMediaViewerActivity.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotredesign/features/media/ImageMediaViewerActivity.kt
rename to vector/src/main/java/im/vector/riotx/features/media/ImageMediaViewerActivity.kt
index fc5e272557..bd3f4480f2 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/media/ImageMediaViewerActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/media/ImageMediaViewerActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.media
+package im.vector.riotx.features.media
 
 import android.content.Context
 import android.content.Intent
@@ -23,9 +23,9 @@ import androidx.appcompat.widget.Toolbar
 import androidx.core.view.isVisible
 import com.github.piasy.biv.indicator.progresspie.ProgressPieIndicator
 import com.github.piasy.biv.view.GlideImageViewFactory
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.glide.GlideApp
-import im.vector.riotredesign.core.platform.VectorBaseActivity
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.glide.GlideApp
+import im.vector.riotx.core.platform.VectorBaseActivity
 import kotlinx.android.synthetic.main.activity_image_media_viewer.*
 import javax.inject.Inject
 
@@ -40,7 +40,7 @@ class ImageMediaViewerActivity : VectorBaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(im.vector.riotredesign.R.layout.activity_image_media_viewer)
+        setContentView(im.vector.riotx.R.layout.activity_image_media_viewer)
         val mediaData = intent.getParcelableExtra<ImageContentRenderer.Data>(EXTRA_MEDIA_DATA)
         if (mediaData.url.isNullOrEmpty()) {
             finish()
diff --git a/vector/src/main/java/im/vector/riotredesign/features/media/VideoContentRenderer.kt b/vector/src/main/java/im/vector/riotx/features/media/VideoContentRenderer.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotredesign/features/media/VideoContentRenderer.kt
rename to vector/src/main/java/im/vector/riotx/features/media/VideoContentRenderer.kt
index 2eb5f062a3..5cba008404 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/media/VideoContentRenderer.kt
+++ b/vector/src/main/java/im/vector/riotx/features/media/VideoContentRenderer.kt
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.media
+package im.vector.riotx.features.media
 
 import android.os.Parcelable
 import android.widget.ImageView
 import android.widget.VideoView
-import im.vector.matrix.android.api.Matrix
-import im.vector.riotredesign.core.di.ActiveSessionHolder
+import im.vector.riotx.core.di.ActiveSessionHolder
 import kotlinx.android.parcel.Parcelize
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/media/VideoMediaViewerActivity.kt b/vector/src/main/java/im/vector/riotx/features/media/VideoMediaViewerActivity.kt
similarity index 87%
rename from vector/src/main/java/im/vector/riotredesign/features/media/VideoMediaViewerActivity.kt
rename to vector/src/main/java/im/vector/riotx/features/media/VideoMediaViewerActivity.kt
index d0b70302cf..e8e4f21381 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/media/VideoMediaViewerActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/media/VideoMediaViewerActivity.kt
@@ -14,15 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.media
+package im.vector.riotx.features.media
 
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.widget.Toolbar
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.platform.VectorBaseActivity
-import im.vector.riotredesign.features.home.AvatarRenderer
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.platform.VectorBaseActivity
 import kotlinx.android.synthetic.main.activity_video_media_viewer.*
 import javax.inject.Inject
 
@@ -37,7 +36,7 @@ class VideoMediaViewerActivity : VectorBaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(im.vector.riotredesign.R.layout.activity_video_media_viewer)
+        setContentView(im.vector.riotx.R.layout.activity_video_media_viewer)
         val mediaData = intent.getParcelableExtra<VideoContentRenderer.Data>(EXTRA_MEDIA_DATA)
         if (mediaData.videoUrl.isNullOrEmpty()) {
             finish()
diff --git a/vector/src/main/java/im/vector/riotredesign/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt
similarity index 76%
rename from vector/src/main/java/im/vector/riotredesign/features/navigation/DefaultNavigator.kt
rename to vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt
index bd0a82a087..82e60c6480 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.navigation
+package im.vector.riotx.features.navigation
 
 import android.content.Context
 import android.content.Intent
 import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.platform.VectorBaseActivity
-import im.vector.riotredesign.core.utils.toast
-import im.vector.riotredesign.features.crypto.keysbackup.settings.KeysBackupManageActivity
-import im.vector.riotredesign.features.crypto.keysbackup.setup.KeysBackupSetupActivity
-import im.vector.riotredesign.features.debug.DebugMenuActivity
-import im.vector.riotredesign.features.home.room.detail.RoomDetailActivity
-import im.vector.riotredesign.features.home.room.detail.RoomDetailArgs
-import im.vector.riotredesign.features.roomdirectory.RoomDirectoryActivity
-import im.vector.riotredesign.features.roomdirectory.roompreview.RoomPreviewActivity
-import im.vector.riotredesign.features.settings.VectorSettingsActivity
+import im.vector.riotx.R
+import im.vector.riotx.core.platform.VectorBaseActivity
+import im.vector.riotx.core.utils.toast
+import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupManageActivity
+import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupActivity
+import im.vector.riotx.features.debug.DebugMenuActivity
+import im.vector.riotx.features.home.room.detail.RoomDetailActivity
+import im.vector.riotx.features.home.room.detail.RoomDetailArgs
+import im.vector.riotx.features.roomdirectory.RoomDirectoryActivity
+import im.vector.riotx.features.roomdirectory.roompreview.RoomPreviewActivity
+import im.vector.riotx.features.settings.VectorSettingsActivity
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/vector/src/main/java/im/vector/riotredesign/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/features/navigation/Navigator.kt
rename to vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt
index 9908f246ac..aada9e18b6 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/navigation/Navigator.kt
+++ b/vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.navigation
+package im.vector.riotx.features.navigation
 
 import android.content.Context
 import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom
diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/BitmapLoader.kt b/vector/src/main/java/im/vector/riotx/features/notifications/BitmapLoader.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotredesign/features/notifications/BitmapLoader.kt
rename to vector/src/main/java/im/vector/riotx/features/notifications/BitmapLoader.kt
index 9a52ea5dbc..d3506be7dc 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/notifications/BitmapLoader.kt
+++ b/vector/src/main/java/im/vector/riotx/features/notifications/BitmapLoader.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.notifications
+package im.vector.riotx.features.notifications
 
 import android.content.Context
 import android.graphics.Bitmap
diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/IconLoader.kt b/vector/src/main/java/im/vector/riotx/features/notifications/IconLoader.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotredesign/features/notifications/IconLoader.kt
rename to vector/src/main/java/im/vector/riotx/features/notifications/IconLoader.kt
index 61da3ea399..c606f90036 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/notifications/IconLoader.kt
+++ b/vector/src/main/java/im/vector/riotx/features/notifications/IconLoader.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.notifications
+package im.vector.riotx.features.notifications
 
 import android.content.Context
 import android.os.Handler
diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/InviteNotifiableEvent.kt b/vector/src/main/java/im/vector/riotx/features/notifications/InviteNotifiableEvent.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/notifications/InviteNotifiableEvent.kt
rename to vector/src/main/java/im/vector/riotx/features/notifications/InviteNotifiableEvent.kt
index 34838de2eb..d6f3655f4a 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/notifications/InviteNotifiableEvent.kt
+++ b/vector/src/main/java/im/vector/riotx/features/notifications/InviteNotifiableEvent.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.notifications
+package im.vector.riotx.features.notifications
 
 import androidx.core.app.NotificationCompat
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotifiableEvent.kt b/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEvent.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/notifications/NotifiableEvent.kt
rename to vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEvent.kt
index 5e2cb667ec..ea2e21ab02 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotifiableEvent.kt
+++ b/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEvent.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.notifications
+package im.vector.riotx.features.notifications
 
 import java.io.Serializable
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotifiableEventResolver.kt b/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEventResolver.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/features/notifications/NotifiableEventResolver.kt
rename to vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEventResolver.kt
index d2e166c215..2ec916526c 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotifiableEventResolver.kt
+++ b/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEventResolver.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.notifications
+package im.vector.riotx.features.notifications
 
 import androidx.core.app.NotificationCompat
 import im.vector.matrix.android.api.session.Session
@@ -25,10 +25,10 @@ import im.vector.matrix.android.api.session.room.model.Membership
 import im.vector.matrix.android.api.session.room.model.RoomMember
 import im.vector.matrix.android.api.session.room.model.message.MessageContent
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
-import im.vector.riotredesign.BuildConfig
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.features.home.room.detail.timeline.format.NoticeEventFormatter
+import im.vector.riotx.BuildConfig
+import im.vector.riotx.R
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.features.home.room.detail.timeline.format.NoticeEventFormatter
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotifiableMessageEvent.kt b/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableMessageEvent.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/features/notifications/NotifiableMessageEvent.kt
rename to vector/src/main/java/im/vector/riotx/features/notifications/NotifiableMessageEvent.kt
index 784aac2bd1..11c2d744f6 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotifiableMessageEvent.kt
+++ b/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableMessageEvent.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.notifications
+package im.vector.riotx.features.notifications
 
 import androidx.core.app.NotificationCompat
 import im.vector.matrix.android.api.session.events.model.EventType
diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationAction.kt b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationAction.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationAction.kt
rename to vector/src/main/java/im/vector/riotx/features/notifications/NotificationAction.kt
index a1eac94610..869a204cf6 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationAction.kt
+++ b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationAction.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.notifications
+package im.vector.riotx.features.notifications
 
 import im.vector.matrix.android.api.pushrules.Action
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationBroadcastReceiver.kt b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationBroadcastReceiver.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationBroadcastReceiver.kt
rename to vector/src/main/java/im/vector/riotx/features/notifications/NotificationBroadcastReceiver.kt
index 2272487e40..791072a27b 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationBroadcastReceiver.kt
+++ b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationBroadcastReceiver.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.notifications
+package im.vector.riotx.features.notifications
 
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -23,9 +23,9 @@ import androidx.core.app.RemoteInput
 import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.room.Room
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.core.extensions.vectorComponent
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.core.extensions.vectorComponent
 import timber.log.Timber
 import java.util.*
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationDrawerManager.kt b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationDrawerManager.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationDrawerManager.kt
rename to vector/src/main/java/im/vector/riotx/features/notifications/NotificationDrawerManager.kt
index a66d6395cf..a704f672ff 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationDrawerManager.kt
+++ b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationDrawerManager.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.notifications
+package im.vector.riotx.features.notifications
 
 import android.app.Notification
 import android.content.Context
@@ -22,10 +22,10 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.Person
 import im.vector.matrix.android.api.session.content.ContentUrlResolver
 import im.vector.matrix.android.api.util.SecretStoringUtils
-import im.vector.riotredesign.BuildConfig
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.features.settings.PreferencesManager
+import im.vector.riotx.BuildConfig
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.features.settings.PreferencesManager
 import me.gujun.android.span.span
 import timber.log.Timber
 import java.io.File
diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationUtils.kt b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationUtils.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationUtils.kt
rename to vector/src/main/java/im/vector/riotx/features/notifications/NotificationUtils.kt
index e91b4d7495..c6673698ab 100755
--- a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationUtils.kt
+++ b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationUtils.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.notifications
+package im.vector.riotx.features.notifications
 
 import android.annotation.SuppressLint
 import android.annotation.TargetApi
@@ -35,13 +35,13 @@ import androidx.core.app.RemoteInput
 import androidx.core.app.TaskStackBuilder
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
-import im.vector.riotredesign.BuildConfig
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.utils.startNotificationChannelSettingsIntent
-import im.vector.riotredesign.features.home.HomeActivity
-import im.vector.riotredesign.features.home.room.detail.RoomDetailActivity
-import im.vector.riotredesign.features.home.room.detail.RoomDetailArgs
-import im.vector.riotredesign.features.settings.PreferencesManager
+import im.vector.riotx.BuildConfig
+import im.vector.riotx.R
+import im.vector.riotx.core.utils.startNotificationChannelSettingsIntent
+import im.vector.riotx.features.home.HomeActivity
+import im.vector.riotx.features.home.room.detail.RoomDetailActivity
+import im.vector.riotx.features.home.room.detail.RoomDetailArgs
+import im.vector.riotx.features.settings.PreferencesManager
 import timber.log.Timber
 import java.util.*
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/OutdatedEventDetector.kt b/vector/src/main/java/im/vector/riotx/features/notifications/OutdatedEventDetector.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotredesign/features/notifications/OutdatedEventDetector.kt
rename to vector/src/main/java/im/vector/riotx/features/notifications/OutdatedEventDetector.kt
index 05bbc2ea77..41ab92cd00 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/notifications/OutdatedEventDetector.kt
+++ b/vector/src/main/java/im/vector/riotx/features/notifications/OutdatedEventDetector.kt
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.notifications
+package im.vector.riotx.features.notifications
 
-import im.vector.riotredesign.core.di.ActiveSessionHolder
+import im.vector.riotx.core.di.ActiveSessionHolder
 import javax.inject.Inject
 
 class OutdatedEventDetector @Inject constructor(private val activeSessionHolder: ActiveSessionHolder) {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/PushRuleTriggerListener.kt b/vector/src/main/java/im/vector/riotx/features/notifications/PushRuleTriggerListener.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/notifications/PushRuleTriggerListener.kt
rename to vector/src/main/java/im/vector/riotx/features/notifications/PushRuleTriggerListener.kt
index 3fa30b31b5..760128dee1 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/notifications/PushRuleTriggerListener.kt
+++ b/vector/src/main/java/im/vector/riotx/features/notifications/PushRuleTriggerListener.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.notifications
+package im.vector.riotx.features.notifications
 
 import im.vector.matrix.android.api.pushrules.Action
 import im.vector.matrix.android.api.pushrules.PushRuleService
diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/RoomEventGroupInfo.kt b/vector/src/main/java/im/vector/riotx/features/notifications/RoomEventGroupInfo.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/notifications/RoomEventGroupInfo.kt
rename to vector/src/main/java/im/vector/riotx/features/notifications/RoomEventGroupInfo.kt
index eac6e4d99c..c0852abbd4 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/notifications/RoomEventGroupInfo.kt
+++ b/vector/src/main/java/im/vector/riotx/features/notifications/RoomEventGroupInfo.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.notifications
+package im.vector.riotx.features.notifications
 
 /**
  * Data class to hold information about a group of notifications for a room
diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/SimpleNotifiableEvent.kt b/vector/src/main/java/im/vector/riotx/features/notifications/SimpleNotifiableEvent.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/notifications/SimpleNotifiableEvent.kt
rename to vector/src/main/java/im/vector/riotx/features/notifications/SimpleNotifiableEvent.kt
index b0226ca3f3..8ec5ff9580 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/notifications/SimpleNotifiableEvent.kt
+++ b/vector/src/main/java/im/vector/riotx/features/notifications/SimpleNotifiableEvent.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.notifications
+package im.vector.riotx.features.notifications
 
 import androidx.core.app.NotificationCompat
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/popup/PopupAlertManager.kt b/vector/src/main/java/im/vector/riotx/features/popup/PopupAlertManager.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotredesign/features/popup/PopupAlertManager.kt
rename to vector/src/main/java/im/vector/riotx/features/popup/PopupAlertManager.kt
index 7d547abcd4..7382ad9fd5 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/popup/PopupAlertManager.kt
+++ b/vector/src/main/java/im/vector/riotx/features/popup/PopupAlertManager.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.popup
+package im.vector.riotx.features.popup
 
 import android.app.Activity
 import android.os.Build
@@ -24,8 +24,8 @@ import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import com.tapadoo.alerter.Alerter
 import com.tapadoo.alerter.OnHideAlertListener
-import im.vector.riotredesign.R
-import im.vector.riotredesign.features.crypto.verification.SASVerificationActivity
+import im.vector.riotx.R
+import im.vector.riotx.features.crypto.verification.SASVerificationActivity
 import timber.log.Timber
 import java.lang.ref.WeakReference
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/rageshake/BugReportActivity.kt b/vector/src/main/java/im/vector/riotx/features/rageshake/BugReportActivity.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/rageshake/BugReportActivity.kt
rename to vector/src/main/java/im/vector/riotx/features/rageshake/BugReportActivity.kt
index 45486ee12c..d0e229ff7b 100755
--- a/vector/src/main/java/im/vector/riotredesign/features/rageshake/BugReportActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/rageshake/BugReportActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.rageshake
+package im.vector.riotx.features.rageshake
 
 import android.text.TextUtils
 import android.view.Menu
@@ -23,9 +23,9 @@ import android.widget.Toast
 import androidx.core.view.isVisible
 import butterknife.OnCheckedChanged
 import butterknife.OnTextChanged
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.platform.VectorBaseActivity
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.platform.VectorBaseActivity
 import kotlinx.android.synthetic.main.activity_bug_report.*
 import timber.log.Timber
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/rageshake/BugReporter.kt b/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporter.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotredesign/features/rageshake/BugReporter.kt
rename to vector/src/main/java/im/vector/riotx/features/rageshake/BugReporter.kt
index 542703742f..7bb75c4ed9 100755
--- a/vector/src/main/java/im/vector/riotredesign/features/rageshake/BugReporter.kt
+++ b/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporter.kt
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.rageshake
+package im.vector.riotx.features.rageshake
 
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -28,14 +28,14 @@ import android.os.Build
 import android.text.TextUtils
 import android.view.View
 import im.vector.matrix.android.api.Matrix
-import im.vector.riotredesign.BuildConfig
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.core.extensions.toOnOff
-import im.vector.riotredesign.core.utils.getDeviceLocale
-import im.vector.riotredesign.features.settings.VectorLocale
-import im.vector.riotredesign.features.themes.ThemeUtils
-import im.vector.riotredesign.features.version.getVersion
+import im.vector.riotx.BuildConfig
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.core.extensions.toOnOff
+import im.vector.riotx.core.utils.getDeviceLocale
+import im.vector.riotx.features.settings.VectorLocale
+import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.riotx.features.version.getVersion
 import okhttp3.*
 import org.json.JSONException
 import org.json.JSONObject
diff --git a/vector/src/main/java/im/vector/riotredesign/features/rageshake/BugReporterMultipartBody.java b/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporterMultipartBody.java
similarity index 99%
rename from vector/src/main/java/im/vector/riotredesign/features/rageshake/BugReporterMultipartBody.java
rename to vector/src/main/java/im/vector/riotx/features/rageshake/BugReporterMultipartBody.java
index 48796efa11..6b0ae149d4 100755
--- a/vector/src/main/java/im/vector/riotredesign/features/rageshake/BugReporterMultipartBody.java
+++ b/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporterMultipartBody.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.rageshake;
+package im.vector.riotx.features.rageshake;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/vector/src/main/java/im/vector/riotredesign/features/rageshake/RageShake.kt b/vector/src/main/java/im/vector/riotx/features/rageshake/RageShake.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/rageshake/RageShake.kt
rename to vector/src/main/java/im/vector/riotx/features/rageshake/RageShake.kt
index 4125ac20e1..d281ea3bb0 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/rageshake/RageShake.kt
+++ b/vector/src/main/java/im/vector/riotx/features/rageshake/RageShake.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.rageshake
+package im.vector.riotx.features.rageshake
 
 import android.content.Context
 import android.hardware.Sensor
@@ -24,7 +24,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.edit
 import com.squareup.seismic.ShakeDetector
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 import javax.inject.Inject
 
 class RageShake @Inject constructor(private val activity: AppCompatActivity,
diff --git a/vector/src/main/java/im/vector/riotredesign/features/rageshake/VectorFileLogger.kt b/vector/src/main/java/im/vector/riotx/features/rageshake/VectorFileLogger.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/rageshake/VectorFileLogger.kt
rename to vector/src/main/java/im/vector/riotx/features/rageshake/VectorFileLogger.kt
index eac958872e..cdea1f0d30 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/rageshake/VectorFileLogger.kt
+++ b/vector/src/main/java/im/vector/riotx/features/rageshake/VectorFileLogger.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.rageshake
+package im.vector.riotx.features.rageshake
 
 import android.content.Context
 import android.text.TextUtils
@@ -36,7 +36,7 @@ object VectorFileLogger : Timber.DebugTree() {
     // relatively large rotation count because closing > opening the app rotates the log (!)
     private const val LOG_ROTATION_COUNT = 15
 
-    private val sLogger = Logger.getLogger("im.vector.riotredesign")
+    private val sLogger = Logger.getLogger("im.vector.riotx")
     private lateinit var sFileHandler: FileHandler
     private lateinit var sCacheDirectory: File
     private var sFileName = "riotx"
diff --git a/vector/src/main/java/im/vector/riotredesign/features/rageshake/VectorUncaughtExceptionHandler.kt b/vector/src/main/java/im/vector/riotx/features/rageshake/VectorUncaughtExceptionHandler.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/features/rageshake/VectorUncaughtExceptionHandler.kt
rename to vector/src/main/java/im/vector/riotx/features/rageshake/VectorUncaughtExceptionHandler.kt
index bd23eb9cfa..86e4d9ee4d 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/rageshake/VectorUncaughtExceptionHandler.kt
+++ b/vector/src/main/java/im/vector/riotx/features/rageshake/VectorUncaughtExceptionHandler.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.rageshake
+package im.vector.riotx.features.rageshake
 
 import android.content.Context
 import android.os.Build
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import im.vector.matrix.android.api.Matrix
-import im.vector.riotredesign.BuildConfig
-import im.vector.riotredesign.features.version.getVersion
+import im.vector.riotx.BuildConfig
+import im.vector.riotx.features.version.getVersion
 import timber.log.Timber
 import java.io.PrintWriter
 import java.io.StringWriter
diff --git a/vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiChooserFragment.kt b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserFragment.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiChooserFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserFragment.kt
index 13ade4721d..0335d0a4b6 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiChooserFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserFragment.kt
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.reactions
+package im.vector.riotx.features.reactions
 
 import android.os.Bundle
 import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.RecyclerView
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.platform.VectorBaseFragment
+import im.vector.riotx.R
+import im.vector.riotx.core.platform.VectorBaseFragment
 
 
 class EmojiChooserFragment : VectorBaseFragment() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiChooserViewModel.kt b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserViewModel.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiChooserViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserViewModel.kt
index 47f2dbf1e0..b03dfb05ee 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiChooserViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserViewModel.kt
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.reactions
+package im.vector.riotx.features.reactions
 
 import android.content.Context
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import im.vector.riotredesign.core.utils.LiveEvent
+import im.vector.riotx.core.utils.LiveEvent
 import javax.inject.Inject
 
 class EmojiChooserViewModel @Inject constructor() : ViewModel() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiDataSource.kt b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiDataSource.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiDataSource.kt
rename to vector/src/main/java/im/vector/riotx/features/reactions/EmojiDataSource.kt
index d892dce2dc..ad824a5ccb 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiDataSource.kt
+++ b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiDataSource.kt
@@ -13,16 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.reactions
+package im.vector.riotx.features.reactions
 
 import android.content.Context
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import com.squareup.moshi.Moshi
-import im.vector.riotredesign.R
-import java.io.InputStreamReader
-import com.squareup.moshi.JsonAdapter
-
+import im.vector.riotx.R
 
 
 class EmojiDataSource(val context: Context) {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiDrawView.kt b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiDrawView.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiDrawView.kt
rename to vector/src/main/java/im/vector/riotx/features/reactions/EmojiDrawView.kt
index 146cc7b9a9..3f20c65aae 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiDrawView.kt
+++ b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiDrawView.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.reactions
+package im.vector.riotx.features.reactions
 
 import android.content.Context
 import android.graphics.Canvas
diff --git a/vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiReactionPickerActivity.kt b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiReactionPickerActivity.kt
rename to vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt
index 5944c81dfb..d8d0fb04da 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiReactionPickerActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.reactions
+package im.vector.riotx.features.reactions
 
 import android.app.Activity
 import android.content.Context
@@ -28,11 +28,11 @@ import androidx.appcompat.widget.Toolbar
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
 import com.google.android.material.tabs.TabLayout
-import im.vector.riotredesign.EmojiCompatFontProvider
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.extensions.observeEvent
-import im.vector.riotredesign.core.platform.VectorBaseActivity
+import im.vector.riotx.EmojiCompatFontProvider
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.extensions.observeEvent
+import im.vector.riotx.core.platform.VectorBaseActivity
 import kotlinx.android.synthetic.main.activity_emoji_reaction_picker.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiRecyclerAdapter.kt b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiRecyclerAdapter.kt
similarity index 99%
rename from vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiRecyclerAdapter.kt
rename to vector/src/main/java/im/vector/riotx/features/reactions/EmojiRecyclerAdapter.kt
index e9f83f729c..a8a7be6f15 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiRecyclerAdapter.kt
+++ b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiRecyclerAdapter.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.reactions
+package im.vector.riotx.features.reactions
 
 import android.os.Build
 import android.os.Trace
@@ -29,7 +29,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.transition.AutoTransition
 import androidx.transition.TransitionManager
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
diff --git a/vector/src/main/java/im/vector/riotredesign/features/reactions/ReactionClickListener.kt b/vector/src/main/java/im/vector/riotx/features/reactions/ReactionClickListener.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotredesign/features/reactions/ReactionClickListener.kt
rename to vector/src/main/java/im/vector/riotx/features/reactions/ReactionClickListener.kt
index 6e520c89ed..b26076b689 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/reactions/ReactionClickListener.kt
+++ b/vector/src/main/java/im/vector/riotx/features/reactions/ReactionClickListener.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.reactions
+package im.vector.riotx.features.reactions
 
 interface ReactionClickListener {
     fun onReactionSelected(reaction: String)
diff --git a/vector/src/main/java/im/vector/riotredesign/features/reactions/widget/CircleView.kt b/vector/src/main/java/im/vector/riotx/features/reactions/widget/CircleView.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotredesign/features/reactions/widget/CircleView.kt
rename to vector/src/main/java/im/vector/riotx/features/reactions/widget/CircleView.kt
index 119f340c7d..6632e23d49 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/reactions/widget/CircleView.kt
+++ b/vector/src/main/java/im/vector/riotx/features/reactions/widget/CircleView.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.reactions.widget
+package im.vector.riotx.features.reactions.widget
 
 import android.animation.ArgbEvaluator
 import android.content.Context
diff --git a/vector/src/main/java/im/vector/riotredesign/features/reactions/widget/DotsView.kt b/vector/src/main/java/im/vector/riotx/features/reactions/widget/DotsView.kt
similarity index 99%
rename from vector/src/main/java/im/vector/riotredesign/features/reactions/widget/DotsView.kt
rename to vector/src/main/java/im/vector/riotx/features/reactions/widget/DotsView.kt
index d0e8fac181..3bb03157ad 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/reactions/widget/DotsView.kt
+++ b/vector/src/main/java/im/vector/riotx/features/reactions/widget/DotsView.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.reactions.widget
+package im.vector.riotx.features.reactions.widget
 
 import android.animation.ArgbEvaluator
 import android.content.Context
diff --git a/vector/src/main/java/im/vector/riotredesign/features/reactions/widget/ReactionButton.kt b/vector/src/main/java/im/vector/riotx/features/reactions/widget/ReactionButton.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotredesign/features/reactions/widget/ReactionButton.kt
rename to vector/src/main/java/im/vector/riotx/features/reactions/widget/ReactionButton.kt
index 8250b66854..0af910a06f 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/reactions/widget/ReactionButton.kt
+++ b/vector/src/main/java/im/vector/riotx/features/reactions/widget/ReactionButton.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.reactions.widget
+package im.vector.riotx.features.reactions.widget
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
@@ -35,8 +35,8 @@ import android.widget.TextView
 import androidx.annotation.ColorInt
 import androidx.annotation.ColorRes
 import androidx.core.content.ContextCompat
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.utils.TextUtils
+import im.vector.riotx.R
+import im.vector.riotx.core.utils.TextUtils
 
 /**
  * An animated reaction button.
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/JoinState.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/JoinState.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/JoinState.kt
rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/JoinState.kt
index a521218119..7792bbb6fd 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/JoinState.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/JoinState.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.roomdirectory
+package im.vector.riotx.features.roomdirectory
 
 /**
  * Join state of a room
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomItem.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomItem.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomItem.kt
rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomItem.kt
index 2f46fbce9b..d3d858f932 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomItem.kt
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.roomdirectory
+package im.vector.riotx.features.roomdirectory
 
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder
-import im.vector.riotredesign.core.epoxy.VectorEpoxyModel
-import im.vector.riotredesign.core.extensions.setTextOrHide
-import im.vector.riotredesign.core.platform.ButtonStateView
-import im.vector.riotredesign.features.home.AvatarRenderer
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.riotx.core.platform.ButtonStateView
+import im.vector.riotx.features.home.AvatarRenderer
 
 @EpoxyModelClass(layout = R.layout.item_public_room)
 abstract class PublicRoomItem : VectorEpoxyModel<PublicRoomItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsController.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsController.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsController.kt
rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsController.kt
index b9bf30e776..47a7722e9d 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsController.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsController.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.roomdirectory
+package im.vector.riotx.features.roomdirectory
 
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.epoxy.VisibilityState
@@ -22,13 +22,13 @@ import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Incomplete
 import com.airbnb.mvrx.Success
 import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.errorWithRetryItem
-import im.vector.riotredesign.core.epoxy.loadingItem
-import im.vector.riotredesign.core.epoxy.noResultItem
-import im.vector.riotredesign.core.error.ErrorFormatter
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.features.home.AvatarRenderer
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.errorWithRetryItem
+import im.vector.riotx.core.epoxy.loadingItem
+import im.vector.riotx.core.epoxy.noResultItem
+import im.vector.riotx.core.error.ErrorFormatter
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.features.home.AvatarRenderer
 import javax.inject.Inject
 
 class PublicRoomsController @Inject constructor(private val stringProvider: StringProvider,
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsFragment.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsFragment.kt
index 05e9d49362..873f8b8ba3 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.roomdirectory
+package im.vector.riotx.features.roomdirectory
 
 import android.os.Bundle
 import android.view.MenuItem
@@ -27,12 +27,12 @@ import com.airbnb.mvrx.withState
 import com.google.android.material.snackbar.Snackbar
 import com.jakewharton.rxbinding2.widget.RxTextView
 import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.error.ErrorFormatter
-import im.vector.riotredesign.core.extensions.observeEvent
-import im.vector.riotredesign.core.platform.VectorBaseFragment
-import im.vector.riotredesign.features.themes.ThemeUtils
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.error.ErrorFormatter
+import im.vector.riotx.core.extensions.observeEvent
+import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.riotx.features.themes.ThemeUtils
 import io.reactivex.rxkotlin.subscribeBy
 import kotlinx.android.synthetic.main.fragment_public_rooms.*
 import timber.log.Timber
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsViewState.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsViewState.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsViewState.kt
rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsViewState.kt
index 0d43368e76..0ad1ac267f 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsViewState.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsViewState.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.roomdirectory
+package im.vector.riotx.features.roomdirectory
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryActivity.kt
similarity index 79%
rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt
rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryActivity.kt
index 1b99b5a116..d708de9478 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryActivity.kt
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.roomdirectory
+package im.vector.riotx.features.roomdirectory
 
 import android.os.Bundle
 import androidx.lifecycle.ViewModelProviders
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.extensions.addFragment
-import im.vector.riotredesign.core.extensions.addFragmentToBackstack
-import im.vector.riotredesign.core.extensions.observeEvent
-import im.vector.riotredesign.core.platform.VectorBaseActivity
-import im.vector.riotredesign.features.roomdirectory.createroom.CreateRoomFragment
-import im.vector.riotredesign.features.roomdirectory.picker.RoomDirectoryPickerFragment
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.extensions.addFragment
+import im.vector.riotx.core.extensions.addFragmentToBackstack
+import im.vector.riotx.core.extensions.observeEvent
+import im.vector.riotx.core.platform.VectorBaseActivity
+import im.vector.riotx.features.roomdirectory.createroom.CreateRoomFragment
+import im.vector.riotx.features.roomdirectory.picker.RoomDirectoryPickerFragment
 import javax.inject.Inject
 
 class RoomDirectoryActivity : VectorBaseActivity() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryNavigationViewModel.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryNavigationViewModel.kt
similarity index 80%
rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryNavigationViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryNavigationViewModel.kt
index e92cd88348..8becb009c9 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryNavigationViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryNavigationViewModel.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.roomdirectory
+package im.vector.riotx.features.roomdirectory
 
-import im.vector.riotredesign.core.mvrx.NavigationViewModel
+import im.vector.riotx.core.mvrx.NavigationViewModel
 import javax.inject.Inject
 
 class RoomDirectoryNavigationViewModel @Inject constructor(): NavigationViewModel<RoomDirectoryActivity.Navigation>()
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryViewModel.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryViewModel.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryViewModel.kt
index 954c0f74e3..b34618e240 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.roomdirectory
+package im.vector.riotx.features.roomdirectory
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
@@ -31,8 +31,8 @@ import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRooms
 import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData
 import im.vector.matrix.android.api.util.Cancelable
 import im.vector.matrix.rx.rx
-import im.vector.riotredesign.core.platform.VectorViewModel
-import im.vector.riotredesign.core.utils.LiveEvent
+import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.riotx.core.utils.LiveEvent
 import timber.log.Timber
 
 private const val PUBLIC_ROOMS_LIMIT = 20
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomController.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomController.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomController.kt
rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomController.kt
index abd78d963e..ad58c0ce26 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomController.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomController.kt
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.roomdirectory.createroom
+package im.vector.riotx.features.roomdirectory.createroom
 
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.errorWithRetryItem
-import im.vector.riotredesign.core.epoxy.loadingItem
-import im.vector.riotredesign.core.error.ErrorFormatter
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.features.form.formEditTextItem
-import im.vector.riotredesign.features.form.formSwitchItem
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.errorWithRetryItem
+import im.vector.riotx.core.epoxy.loadingItem
+import im.vector.riotx.core.error.ErrorFormatter
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.features.form.formEditTextItem
+import im.vector.riotx.features.form.formSwitchItem
 import javax.inject.Inject
 
 class CreateRoomController @Inject constructor(private val stringProvider: StringProvider,
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomFragment.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomFragment.kt
index ee96296194..28dc761a92 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.roomdirectory.createroom
+package im.vector.riotx.features.roomdirectory.createroom
 
 import android.os.Bundle
 import android.view.MenuItem
@@ -23,11 +23,11 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.platform.VectorBaseFragment
-import im.vector.riotredesign.features.roomdirectory.RoomDirectoryActivity
-import im.vector.riotredesign.features.roomdirectory.RoomDirectoryNavigationViewModel
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.riotx.features.roomdirectory.RoomDirectoryActivity
+import im.vector.riotx.features.roomdirectory.RoomDirectoryNavigationViewModel
 import kotlinx.android.synthetic.main.fragment_create_room.*
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomViewModel.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewModel.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewModel.kt
index f928e20c18..c6a4ff1797 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.roomdirectory.createroom
+package im.vector.riotx.features.roomdirectory.createroom
 
 import com.airbnb.mvrx.*
 import com.squareup.inject.assisted.Assisted
@@ -24,7 +24,7 @@ import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.room.model.RoomDirectoryVisibility
 import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams
 import im.vector.matrix.android.api.session.room.model.create.CreateRoomPreset
-import im.vector.riotredesign.core.platform.VectorViewModel
+import im.vector.riotx.core.platform.VectorViewModel
 
 class CreateRoomViewModel @AssistedInject constructor(@Assisted initialState: CreateRoomViewState,
                                                       private val session: Session
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomViewState.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewState.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomViewState.kt
rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewState.kt
index 42d9d14473..7338d9fd49 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomViewState.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewState.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.roomdirectory.createroom
+package im.vector.riotx.features.roomdirectory.createroom
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryItem.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryItem.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryItem.kt
rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryItem.kt
index e4b280f4a6..72fde05908 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryItem.kt
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.roomdirectory.picker
+package im.vector.riotx.features.roomdirectory.picker
 
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder
-import im.vector.riotredesign.core.epoxy.VectorEpoxyModel
-import im.vector.riotredesign.core.extensions.setTextOrHide
-import im.vector.riotredesign.core.glide.GlideApp
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.riotx.core.glide.GlideApp
 
 @EpoxyModelClass(layout = R.layout.item_room_directory)
 abstract class RoomDirectoryItem : VectorEpoxyModel<RoomDirectoryItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryListCreator.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryListCreator.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryListCreator.kt
rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryListCreator.kt
index dadb4fa9b7..d4eeb67c64 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryListCreator.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryListCreator.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.roomdirectory.picker
+package im.vector.riotx.features.roomdirectory.picker
 
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData
 import im.vector.matrix.android.api.session.room.model.thirdparty.ThirdPartyProtocol
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.resources.StringArrayProvider
+import im.vector.riotx.R
+import im.vector.riotx.core.resources.StringArrayProvider
 import javax.inject.Inject
 
 class RoomDirectoryListCreator @Inject constructor(private val stringArrayProvider: StringArrayProvider,
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerController.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerController.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerController.kt
rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerController.kt
index b80944b956..3b0f4f5c50 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerController.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerController.kt
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.roomdirectory.picker
+package im.vector.riotx.features.roomdirectory.picker
 
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Incomplete
 import com.airbnb.mvrx.Success
 import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.errorWithRetryItem
-import im.vector.riotredesign.core.epoxy.loadingItem
-import im.vector.riotredesign.core.error.ErrorFormatter
-import im.vector.riotredesign.core.resources.StringProvider
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.errorWithRetryItem
+import im.vector.riotx.core.epoxy.loadingItem
+import im.vector.riotx.core.error.ErrorFormatter
+import im.vector.riotx.core.resources.StringProvider
 import javax.inject.Inject
 
 class RoomDirectoryPickerController @Inject constructor(private val stringProvider: StringProvider,
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
index bde76fd282..241e880ccc 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.roomdirectory.picker
+package im.vector.riotx.features.roomdirectory.picker
 
 import android.os.Bundle
 import android.view.MenuItem
@@ -25,12 +25,12 @@ import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.platform.VectorBaseFragment
-import im.vector.riotredesign.features.roomdirectory.RoomDirectoryActivity
-import im.vector.riotredesign.features.roomdirectory.RoomDirectoryNavigationViewModel
-import im.vector.riotredesign.features.roomdirectory.RoomDirectoryViewModel
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.riotx.features.roomdirectory.RoomDirectoryActivity
+import im.vector.riotx.features.roomdirectory.RoomDirectoryNavigationViewModel
+import im.vector.riotx.features.roomdirectory.RoomDirectoryViewModel
 import kotlinx.android.synthetic.main.fragment_room_directory_picker.*
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt
index 6b5d86fb12..746fe61c85 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.roomdirectory.picker
+package im.vector.riotx.features.roomdirectory.picker
 
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.FragmentViewModelContext
@@ -26,7 +26,7 @@ import com.squareup.inject.assisted.AssistedInject
 import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.room.model.thirdparty.ThirdPartyProtocol
-import im.vector.riotredesign.core.platform.VectorViewModel
+import im.vector.riotx.core.platform.VectorViewModel
 
 class RoomDirectoryPickerViewModel @AssistedInject constructor(@Assisted initialState: RoomDirectoryPickerViewState,
                                                                private val session: Session) : VectorViewModel<RoomDirectoryPickerViewState>(initialState) {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt
rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt
index 81b1081262..be5c137831 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.roomdirectory.picker
+package im.vector.riotx.features.roomdirectory.picker
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewActivity.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewActivity.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewActivity.kt
rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewActivity.kt
index 46044914c4..85da8f2d22 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewActivity.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.roomdirectory.roompreview
+package im.vector.riotx.features.roomdirectory.roompreview
 
 import android.content.Context
 import android.content.Intent
 import android.os.Parcelable
 import androidx.appcompat.widget.Toolbar
 import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.extensions.addFragment
-import im.vector.riotredesign.core.platform.ToolbarConfigurable
-import im.vector.riotredesign.core.platform.VectorBaseActivity
+import im.vector.riotx.R
+import im.vector.riotx.core.extensions.addFragment
+import im.vector.riotx.core.platform.ToolbarConfigurable
+import im.vector.riotx.core.platform.VectorBaseActivity
 import kotlinx.android.parcel.Parcelize
 
 @Parcelize
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt
index 2fbd8a7c5c..c0da697a95 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.roomdirectory.roompreview
+package im.vector.riotx.features.roomdirectory.roompreview
 
 import android.os.Bundle
 import android.view.View
@@ -23,14 +23,14 @@ import androidx.transition.TransitionManager
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.error.ErrorFormatter
-import im.vector.riotredesign.core.extensions.setTextOrHide
-import im.vector.riotredesign.core.platform.ButtonStateView
-import im.vector.riotredesign.core.platform.VectorBaseFragment
-import im.vector.riotredesign.features.home.AvatarRenderer
-import im.vector.riotredesign.features.roomdirectory.JoinState
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.error.ErrorFormatter
+import im.vector.riotx.core.extensions.setTextOrHide
+import im.vector.riotx.core.platform.ButtonStateView
+import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.riotx.features.roomdirectory.JoinState
 import kotlinx.android.synthetic.main.fragment_room_preview_no_preview.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewViewModel.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
index 61102f110f..bf5fa74321 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.roomdirectory.roompreview
+package im.vector.riotx.features.roomdirectory.roompreview
 
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
@@ -25,8 +25,8 @@ import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.room.model.Membership
 import im.vector.matrix.rx.rx
-import im.vector.riotredesign.core.platform.VectorViewModel
-import im.vector.riotredesign.features.roomdirectory.JoinState
+import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.riotx.features.roomdirectory.JoinState
 import timber.log.Timber
 
 class RoomPreviewViewModel @AssistedInject constructor(@Assisted initialState: RoomPreviewViewState,
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewViewState.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewViewState.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewViewState.kt
rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewViewState.kt
index 4ba4bdee2f..81657c6874 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewViewState.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewViewState.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.roomdirectory.roompreview
+package im.vector.riotx.features.roomdirectory.roompreview
 
 import com.airbnb.mvrx.MvRxState
-import im.vector.riotredesign.features.roomdirectory.JoinState
+import im.vector.riotx.features.roomdirectory.JoinState
 
 data class RoomPreviewViewState(
         // The room id
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/FontScale.kt b/vector/src/main/java/im/vector/riotx/features/settings/FontScale.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/FontScale.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/FontScale.kt
index ad8a450689..52cd2c6300 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/FontScale.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/FontScale.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.settings
+package im.vector.riotx.features.settings
 
 import android.content.Context
 import android.content.res.Configuration
 import android.text.TextUtils
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 /**
  * Object to manage the Font Scale choice of the user
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/PreferencesManager.java b/vector/src/main/java/im/vector/riotx/features/settings/PreferencesManager.java
similarity index 99%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/PreferencesManager.java
rename to vector/src/main/java/im/vector/riotx/features/settings/PreferencesManager.java
index 89dc3bde95..e24bc2fe9c 100755
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/PreferencesManager.java
+++ b/vector/src/main/java/im/vector/riotx/features/settings/PreferencesManager.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.settings;
+package im.vector.riotx.features.settings;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -34,9 +34,9 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import im.vector.riotredesign.R;
-import im.vector.riotredesign.features.homeserver.ServerUrlsRepository;
-import im.vector.riotredesign.features.themes.ThemeUtils;
+import im.vector.riotx.R;
+import im.vector.riotx.features.homeserver.ServerUrlsRepository;
+import im.vector.riotx.features.themes.ThemeUtils;
 import timber.log.Timber;
 
 public class PreferencesManager {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorLocale.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorLocale.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorLocale.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/VectorLocale.kt
index 0c88f508bb..a7ee3012c7 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorLocale.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorLocale.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.settings
+package im.vector.riotx.features.settings
 
 import android.content.Context
 import android.content.res.Configuration
@@ -23,7 +23,7 @@ import android.preference.PreferenceManager
 import android.text.TextUtils
 import android.util.Pair
 import androidx.core.content.edit
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsActivity.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsActivity.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsActivity.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsActivity.kt
index 5207efd5fa..3e109a23da 100755
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsActivity.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.settings
+package im.vector.riotx.features.settings
 
 import android.content.Context
 import android.content.Intent
@@ -22,9 +22,9 @@ import androidx.fragment.app.FragmentManager
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import im.vector.matrix.android.api.session.Session
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.platform.VectorBaseActivity
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.platform.VectorBaseActivity
 import kotlinx.android.synthetic.main.activity_vector_settings.*
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt
index 1392a3bac5..906cf5ea6a 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt
@@ -13,28 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.settings
+package im.vector.riotx.features.settings
 
 import android.app.Activity
 import android.content.Intent
 import android.media.RingtoneManager
 import android.net.Uri
-import android.os.Bundle
 import android.os.Parcelable
-import android.view.View
 import androidx.core.content.edit
 import androidx.preference.Preference
 import androidx.preference.PreferenceManager
-import im.vector.matrix.android.api.session.Session
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.extensions.withArgs
-import im.vector.riotredesign.core.platform.VectorBaseActivity
-import im.vector.riotredesign.core.platform.VectorPreferenceFragment
-import im.vector.riotredesign.core.preference.BingRule
-import im.vector.riotredesign.core.preference.BingRulePreference
-import im.vector.riotredesign.features.notifications.NotificationUtils
-import im.vector.riotredesign.features.notifications.supportNotificationChannels
-import javax.inject.Inject
+import im.vector.riotx.R
+import im.vector.riotx.core.extensions.withArgs
+import im.vector.riotx.core.preference.BingRule
+import im.vector.riotx.core.preference.BingRulePreference
+import im.vector.riotx.features.notifications.NotificationUtils
+import im.vector.riotx.features.notifications.supportNotificationChannels
 
 class VectorSettingsAdvancedNotificationPreferenceFragment : VectorSettingsBaseFragment() {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsBaseFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsBaseFragment.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsBaseFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsBaseFragment.kt
index f5abb7ce4a..b78921b5b9 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsBaseFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsBaseFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.settings
+package im.vector.riotx.features.settings
 
 import android.content.Context
 import android.os.Bundle
@@ -23,12 +23,12 @@ import android.view.View
 import androidx.annotation.CallSuper
 import androidx.preference.PreferenceFragmentCompat
 import im.vector.matrix.android.api.session.Session
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.DaggerScreenComponent
-import im.vector.riotredesign.core.di.HasScreenInjector
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.platform.VectorBaseActivity
-import im.vector.riotredesign.core.utils.toast
+import im.vector.riotx.R
+import im.vector.riotx.core.di.DaggerScreenComponent
+import im.vector.riotx.core.di.HasScreenInjector
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.platform.VectorBaseActivity
+import im.vector.riotx.core.utils.toast
 import timber.log.Timber
 
 abstract class VectorSettingsBaseFragment : PreferenceFragmentCompat(), HasScreenInjector {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsFlairFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsFlairFragment.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsFlairFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsFlairFragment.kt
index abab41607a..d2ea197087 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsFlairFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsFlairFragment.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.settings
+package im.vector.riotx.features.settings
 
 import androidx.preference.PreferenceCategory
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.preference.ProgressBarPreference
+import im.vector.riotx.R
+import im.vector.riotx.core.preference.ProgressBarPreference
 
 class VectorSettingsFlairFragment : VectorSettingsBaseFragment() {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsFragmentInteractionListener.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsFragmentInteractionListener.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsFragmentInteractionListener.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsFragmentInteractionListener.kt
index f141f94908..db96a4b68f 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsFragmentInteractionListener.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsFragmentInteractionListener.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.settings
+package im.vector.riotx.features.settings
 
 interface VectorSettingsFragmentInteractionListener {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsGeneralFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt
index aa7ce30446..0e1c448cf6 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsGeneralFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.settings
+package im.vector.riotx.features.settings
 
 import android.app.Activity
 import android.content.Context
@@ -35,18 +35,18 @@ import androidx.preference.PreferenceCategory
 import com.bumptech.glide.Glide
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.extensions.showPassword
-import im.vector.riotredesign.core.platform.SimpleTextWatcher
-import im.vector.riotredesign.core.preference.UserAvatarPreference
-import im.vector.riotredesign.core.preference.VectorPreference
-import im.vector.riotredesign.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
-import im.vector.riotredesign.core.utils.allGranted
-import im.vector.riotredesign.core.utils.copyToClipboard
-import im.vector.riotredesign.core.utils.toast
-import im.vector.riotredesign.features.MainActivity
-import im.vector.riotredesign.features.themes.ThemeUtils
-import im.vector.riotredesign.features.workers.signout.SignOutUiWorker
+import im.vector.riotx.R
+import im.vector.riotx.core.extensions.showPassword
+import im.vector.riotx.core.platform.SimpleTextWatcher
+import im.vector.riotx.core.preference.UserAvatarPreference
+import im.vector.riotx.core.preference.VectorPreference
+import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
+import im.vector.riotx.core.utils.allGranted
+import im.vector.riotx.core.utils.copyToClipboard
+import im.vector.riotx.core.utils.toast
+import im.vector.riotx.features.MainActivity
+import im.vector.riotx.features.themes.ThemeUtils
+import im.vector.riotx.features.workers.signout.SignOutUiWorker
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsHelpAboutFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsHelpAboutFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt
index f67f89bb02..2be698a21b 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsHelpAboutFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.settings
+package im.vector.riotx.features.settings
 
 import android.content.Intent
 import android.net.Uri
@@ -22,10 +22,10 @@ import android.provider.Settings
 import androidx.preference.Preference
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
 import im.vector.matrix.android.api.Matrix
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.utils.copyToClipboard
-import im.vector.riotredesign.core.utils.displayInWebView
-import im.vector.riotredesign.features.version.getVersion
+import im.vector.riotx.R
+import im.vector.riotx.core.utils.copyToClipboard
+import im.vector.riotx.core.utils.displayInWebView
+import im.vector.riotx.features.version.getVersion
 
 class VectorSettingsHelpAboutFragment : VectorSettingsBaseFragment() {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsIgnoredUsersFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsIgnoredUsersFragment.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsIgnoredUsersFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsIgnoredUsersFragment.kt
index 5fce7b63ea..3532a794f6 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsIgnoredUsersFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsIgnoredUsersFragment.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.settings
+package im.vector.riotx.features.settings
 
 import androidx.appcompat.app.AlertDialog
 import androidx.preference.Preference
 import androidx.preference.PreferenceCategory
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 import java.util.ArrayList
 import kotlin.Comparator
 import kotlin.String
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsLabsFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsLabsFragment.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsLabsFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsLabsFragment.kt
index f9bd57fbfb..bb5ad0ee66 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsLabsFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsLabsFragment.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.settings
+package im.vector.riotx.features.settings
 
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 class VectorSettingsLabsFragment : VectorSettingsBaseFragment() {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsNotificationFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationFragment.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsNotificationFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationFragment.kt
index ead9f9e393..953124616c 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsNotificationFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationFragment.kt
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.settings
+package im.vector.riotx.features.settings
 
 import android.widget.Toast
 import androidx.preference.Preference
 import androidx.preference.SwitchPreference
 import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.pushrules.RuleIds
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.pushers.PushersManager
-import im.vector.riotredesign.push.fcm.FcmHelper
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.pushers.PushersManager
+import im.vector.riotx.push.fcm.FcmHelper
 import javax.inject.Inject
 
 // Referenced in vector_settings_preferences_root.xml
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
index 0db2bfd694..428a52c799 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.settings
+package im.vector.riotx.features.settings
 
 import android.app.Activity
 import android.content.Context
@@ -29,15 +29,15 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.transition.TransitionManager
 import butterknife.BindView
 import im.vector.matrix.android.api.session.Session
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.core.extensions.withArgs
-import im.vector.riotredesign.core.platform.VectorBaseActivity
-import im.vector.riotredesign.core.platform.VectorBaseFragment
-import im.vector.riotredesign.features.rageshake.BugReporter
-import im.vector.riotredesign.features.settings.troubleshoot.NotificationTroubleshootTestManager
-import im.vector.riotredesign.features.settings.troubleshoot.TroubleshootTest
-import im.vector.riotredesign.push.fcm.NotificationTroubleshootTestManagerFactory
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.core.extensions.withArgs
+import im.vector.riotx.core.platform.VectorBaseActivity
+import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.riotx.features.rageshake.BugReporter
+import im.vector.riotx.features.settings.troubleshoot.NotificationTroubleshootTestManager
+import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
+import im.vector.riotx.push.fcm.NotificationTroubleshootTestManagerFactory
 import javax.inject.Inject
 
 class VectorSettingsNotificationsTroubleshootFragment : VectorBaseFragment() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsPreferencesFragment.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsPreferencesFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsPreferencesFragment.kt
index 0a82ef9f76..962be362bd 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsPreferencesFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsPreferencesFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.settings
+package im.vector.riotx.features.settings
 
 import android.app.Activity
 import android.content.Context
@@ -25,10 +25,10 @@ import android.widget.LinearLayout
 import androidx.appcompat.app.AlertDialog
 import androidx.preference.Preference
 import androidx.preference.SwitchPreference
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ScreenComponent
-import im.vector.riotredesign.features.configuration.VectorConfiguration
-import im.vector.riotredesign.features.themes.ThemeUtils
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ScreenComponent
+import im.vector.riotx.features.configuration.VectorConfiguration
+import im.vector.riotx.features.themes.ThemeUtils
 import javax.inject.Inject
 
 class VectorSettingsPreferencesFragment : VectorSettingsBaseFragment() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsRootFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsRootFragment.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsRootFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsRootFragment.kt
index 842f161f38..ed82382513 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsRootFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsRootFragment.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.settings
+package im.vector.riotx.features.settings
 
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.extensions.withArgs
+import im.vector.riotx.R
+import im.vector.riotx.core.extensions.withArgs
 
 class VectorSettingsRootFragment : VectorSettingsBaseFragment() {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsSecurityPrivacyFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt
similarity index 97%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsSecurityPrivacyFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt
index 398952352c..474777cbc6 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsSecurityPrivacyFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.settings
+package im.vector.riotx.features.settings
 
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -41,18 +41,18 @@ import im.vector.matrix.android.internal.auth.data.LoginFlowTypes
 import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult
 import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo
 import im.vector.matrix.android.internal.crypto.model.rest.DevicesListResponse
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.dialogs.ExportKeysDialog
-import im.vector.riotredesign.core.intent.ExternalIntentData
-import im.vector.riotredesign.core.intent.analyseIntent
-import im.vector.riotredesign.core.intent.getFilenameFromUri
-import im.vector.riotredesign.core.platform.SimpleTextWatcher
-import im.vector.riotredesign.core.preference.ProgressBarPreference
-import im.vector.riotredesign.core.preference.VectorPreference
-import im.vector.riotredesign.core.utils.*
-import im.vector.riotredesign.features.crypto.keys.KeysExporter
-import im.vector.riotredesign.features.crypto.keys.KeysImporter
-import im.vector.riotredesign.features.crypto.keysbackup.settings.KeysBackupManageActivity
+import im.vector.riotx.R
+import im.vector.riotx.core.dialogs.ExportKeysDialog
+import im.vector.riotx.core.intent.ExternalIntentData
+import im.vector.riotx.core.intent.analyseIntent
+import im.vector.riotx.core.intent.getFilenameFromUri
+import im.vector.riotx.core.platform.SimpleTextWatcher
+import im.vector.riotx.core.preference.ProgressBarPreference
+import im.vector.riotx.core.preference.VectorPreference
+import im.vector.riotx.core.utils.*
+import im.vector.riotx.features.crypto.keys.KeysExporter
+import im.vector.riotx.features.crypto.keys.KeysImporter
+import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupManageActivity
 import timber.log.Timber
 import java.text.DateFormat
 import java.text.SimpleDateFormat
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsUrls.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsUrls.kt
similarity index 94%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsUrls.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsUrls.kt
index 23babd4b04..43fcd9834d 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsUrls.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsUrls.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.settings
+package im.vector.riotx.features.settings
 
 object VectorSettingsUrls {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsVoiceVideoFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsVoiceVideoFragment.kt
similarity index 91%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsVoiceVideoFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsVoiceVideoFragment.kt
index 04c9393d4b..6e62efa7bb 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsVoiceVideoFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsVoiceVideoFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.settings
+package im.vector.riotx.features.settings
 
 import android.app.Activity
 import android.content.Intent
@@ -22,11 +22,11 @@ import android.media.RingtoneManager
 import android.net.Uri
 import androidx.preference.Preference
 import androidx.preference.SwitchPreference
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.utils.getCallRingtoneName
-import im.vector.riotredesign.core.utils.getCallRingtoneUri
-import im.vector.riotredesign.core.utils.setCallRingtoneUri
-import im.vector.riotredesign.core.utils.setUseRiotDefaultRingtone
+import im.vector.riotx.R
+import im.vector.riotx.core.utils.getCallRingtoneName
+import im.vector.riotx.core.utils.getCallRingtoneUri
+import im.vector.riotx.core.utils.setCallRingtoneUri
+import im.vector.riotx.core.utils.setUseRiotDefaultRingtone
 
 class VectorSettingsVoiceVideoFragment : VectorSettingsBaseFragment() {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushGatewayItem.kt b/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewayItem.kt
similarity index 92%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/push/PushGatewayItem.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewayItem.kt
index 4e3e116647..e2777fed12 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushGatewayItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewayItem.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.settings.push
+package im.vector.riotx.features.settings.push
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
 import im.vector.matrix.android.api.session.pushers.Pusher
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.VectorEpoxyHolder
 
 
 @EpoxyModelClass(layout = R.layout.item_pushgateway)
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushGatewaysFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysFragment.kt
similarity index 90%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/push/PushGatewaysFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysFragment.kt
index b51c131cf0..275e66a6da 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushGatewaysFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.settings.push
+package im.vector.riotx.features.settings.push
 
 import android.os.Bundle
 import androidx.recyclerview.widget.DividerItemDecoration
@@ -23,11 +23,11 @@ import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.platform.VectorBaseActivity
-import im.vector.riotredesign.core.platform.VectorBaseFragment
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.core.ui.list.genericFooterItem
+import im.vector.riotx.R
+import im.vector.riotx.core.platform.VectorBaseActivity
+import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.core.ui.list.genericFooterItem
 import kotlinx.android.synthetic.main.fragment_generic_recycler_epoxy.*
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushGatewaysViewModel.kt b/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysViewModel.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/push/PushGatewaysViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysViewModel.kt
index 70bbd17a7d..7d05c6a7b3 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushGatewaysViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.settings.push
+package im.vector.riotx.features.settings.push
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.FragmentViewModelContext
@@ -27,7 +27,7 @@ import com.squareup.inject.assisted.AssistedInject
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.pushers.Pusher
 import im.vector.matrix.rx.RxSession
-import im.vector.riotredesign.core.platform.VectorViewModel
+import im.vector.riotx.core.platform.VectorViewModel
 
 
 data class PushGatewayViewState(
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushRuleItem.kt b/vector/src/main/java/im/vector/riotx/features/settings/push/PushRuleItem.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/push/PushRuleItem.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/push/PushRuleItem.kt
index 5af89c00f5..47c9a06a09 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushRuleItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/push/PushRuleItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.settings.push
+package im.vector.riotx.features.settings.push
 
 import android.annotation.SuppressLint
 import android.graphics.Color
@@ -28,9 +28,9 @@ import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
 import im.vector.matrix.android.api.pushrules.Action
 import im.vector.matrix.android.api.pushrules.rest.PushRule
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder
-import im.vector.riotredesign.features.notifications.NotificationAction
+import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.VectorEpoxyHolder
+import im.vector.riotx.features.notifications.NotificationAction
 
 
 @EpoxyModelClass(layout = R.layout.item_pushrule_raw)
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushRulesFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesFragment.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/push/PushRulesFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesFragment.kt
index 3d5881db22..23018dc7d8 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushRulesFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesFragment.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.settings.push
+package im.vector.riotx.features.settings.push
 
 import android.os.Bundle
 import androidx.recyclerview.widget.DividerItemDecoration
@@ -22,11 +22,11 @@ import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.platform.VectorBaseActivity
-import im.vector.riotredesign.core.platform.VectorBaseFragment
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.core.ui.list.genericFooterItem
+import im.vector.riotx.R
+import im.vector.riotx.core.platform.VectorBaseActivity
+import im.vector.riotx.core.platform.VectorBaseFragment
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.core.ui.list.genericFooterItem
 import kotlinx.android.synthetic.main.fragment_generic_recycler_epoxy.*
 
 // Referenced in vector_settings_notifications.xml
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushRulesViewModel.kt b/vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesViewModel.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/push/PushRulesViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesViewModel.kt
index 24294353ae..9de839b364 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushRulesViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesViewModel.kt
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.settings.push
+package im.vector.riotx.features.settings.push
 
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import im.vector.matrix.android.api.pushrules.rest.PushRule
-import im.vector.riotredesign.core.di.HasScreenInjector
-import im.vector.riotredesign.core.platform.VectorViewModel
+import im.vector.riotx.core.di.HasScreenInjector
+import im.vector.riotx.core.platform.VectorViewModel
 
 data class PushRulesViewState(
         val rules: List<PushRule> = emptyList()
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
similarity index 96%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
index 779ab8fc9a..c3b53de017 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.settings.troubleshoot
+package im.vector.riotx.features.settings.troubleshoot
 
 import android.os.Build
 import android.view.LayoutInflater
@@ -27,8 +27,8 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
 import butterknife.ButterKnife
-import im.vector.riotredesign.R
-import im.vector.riotredesign.features.themes.ThemeUtils
+import im.vector.riotx.R
+import im.vector.riotx.features.themes.ThemeUtils
 
 class NotificationTroubleshootRecyclerViewAdapter(val tests: ArrayList<TroubleshootTest>)
     : RecyclerView.Adapter<NotificationTroubleshootRecyclerViewAdapter.ViewHolder>() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
index 0cc8941748..09f8c0607a 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.settings.troubleshoot
+package im.vector.riotx.features.settings.troubleshoot
 
 import android.os.Handler
 import android.os.Looper
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestAccountSettings.kt b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestAccountSettings.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestAccountSettings.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestAccountSettings.kt
index efb916071a..47d1f6358a 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestAccountSettings.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestAccountSettings.kt
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.settings.troubleshoot
+package im.vector.riotx.features.settings.troubleshoot
 
 import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.pushrules.RuleIds
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.core.resources.StringProvider
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.core.resources.StringProvider
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestBingRulesSettings.kt b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestBingRulesSettings.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestBingRulesSettings.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestBingRulesSettings.kt
index 41ff19f517..e820bc5e47 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestBingRulesSettings.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestBingRulesSettings.kt
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.settings.troubleshoot
+package im.vector.riotx.features.settings.troubleshoot
 
 import im.vector.matrix.android.api.pushrules.Action
 import im.vector.matrix.android.api.pushrules.RuleIds
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.features.notifications.NotificationAction
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.features.notifications.NotificationAction
 import javax.inject.Inject
 
 class TestBingRulesSettings @Inject constructor(private val activeSessionHolder: ActiveSessionHolder,
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestDeviceSettings.kt b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestDeviceSettings.kt
similarity index 88%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestDeviceSettings.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestDeviceSettings.kt
index dd783f621f..b6e2d3d7e6 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestDeviceSettings.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestDeviceSettings.kt
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.settings.troubleshoot
+package im.vector.riotx.features.settings.troubleshoot
 
 import androidx.appcompat.app.AppCompatActivity
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.features.settings.PreferencesManager
+import im.vector.riotx.R
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.features.settings.PreferencesManager
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestSystemSettings.kt b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestSystemSettings.kt
similarity index 89%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestSystemSettings.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestSystemSettings.kt
index 9d336f9d6f..653f33307d 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestSystemSettings.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestSystemSettings.kt
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.settings.troubleshoot
+package im.vector.riotx.features.settings.troubleshoot
 
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.NotificationManagerCompat
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.core.utils.startNotificationSettingsIntent
+import im.vector.riotx.R
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.core.utils.startNotificationSettingsIntent
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TroubleshootTest.kt b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TroubleshootTest.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TroubleshootTest.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TroubleshootTest.kt
index b9f6281e5b..950382c176 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TroubleshootTest.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TroubleshootTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.features.settings.troubleshoot
+package im.vector.riotx.features.settings.troubleshoot
 
 import androidx.annotation.StringRes
 import kotlin.properties.Delegates
diff --git a/vector/src/main/java/im/vector/riotredesign/features/themes/ActivityOtherThemes.kt b/vector/src/main/java/im/vector/riotx/features/themes/ActivityOtherThemes.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/features/themes/ActivityOtherThemes.kt
rename to vector/src/main/java/im/vector/riotx/features/themes/ActivityOtherThemes.kt
index 159a480137..3cfba65acb 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/themes/ActivityOtherThemes.kt
+++ b/vector/src/main/java/im/vector/riotx/features/themes/ActivityOtherThemes.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.themes
+package im.vector.riotx.features.themes
 
 import androidx.annotation.StyleRes
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 /**
  * Class to manage Activity other possible themes.
diff --git a/vector/src/main/java/im/vector/riotredesign/features/themes/ThemeUtils.kt b/vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt
similarity index 99%
rename from vector/src/main/java/im/vector/riotredesign/features/themes/ThemeUtils.kt
rename to vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt
index 26a265df60..a3e33271af 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/themes/ThemeUtils.kt
+++ b/vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.themes
+package im.vector.riotx.features.themes
 
 
 import android.app.Activity
@@ -27,7 +27,7 @@ import androidx.annotation.ColorInt
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.preference.PreferenceManager
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 import timber.log.Timber
 import java.util.*
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/version/Version.kt b/vector/src/main/java/im/vector/riotx/features/version/Version.kt
similarity index 93%
rename from vector/src/main/java/im/vector/riotredesign/features/version/Version.kt
rename to vector/src/main/java/im/vector/riotx/features/version/Version.kt
index 826fe1564a..c058dc2680 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/version/Version.kt
+++ b/vector/src/main/java/im/vector/riotx/features/version/Version.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.version
+package im.vector.riotx.features.version
 
-import im.vector.riotredesign.BuildConfig
+import im.vector.riotx.BuildConfig
 
 fun getVersion(longFormat: Boolean, useBuildNumber: Boolean): String {
     var result = BuildConfig.VERSION_NAME
diff --git a/vector/src/main/java/im/vector/riotredesign/features/workers/signout/SignOutBottomSheetDialogFragment.kt b/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutBottomSheetDialogFragment.kt
similarity index 95%
rename from vector/src/main/java/im/vector/riotredesign/features/workers/signout/SignOutBottomSheetDialogFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutBottomSheetDialogFragment.kt
index d9c6d7f90d..c06a40e849 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/workers/signout/SignOutBottomSheetDialogFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutBottomSheetDialogFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.workers.signout
+package im.vector.riotx.features.workers.signout
 
 import android.app.Activity
 import android.app.Dialog
@@ -41,12 +41,12 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.DaggerScreenComponent
-import im.vector.riotredesign.core.platform.VectorBaseActivity
-import im.vector.riotredesign.core.utils.toast
-import im.vector.riotredesign.features.crypto.keysbackup.settings.KeysBackupManageActivity
-import im.vector.riotredesign.features.crypto.keysbackup.setup.KeysBackupSetupActivity
+import im.vector.riotx.R
+import im.vector.riotx.core.di.DaggerScreenComponent
+import im.vector.riotx.core.platform.VectorBaseActivity
+import im.vector.riotx.core.utils.toast
+import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupManageActivity
+import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupActivity
 
 
 class SignOutBottomSheetDialogFragment : BottomSheetDialogFragment() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/workers/signout/SignOutUiWorker.kt b/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutUiWorker.kt
similarity index 86%
rename from vector/src/main/java/im/vector/riotredesign/features/workers/signout/SignOutUiWorker.kt
rename to vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutUiWorker.kt
index 7de9fd9595..8bc8973bd5 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/workers/signout/SignOutUiWorker.kt
+++ b/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutUiWorker.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.workers.signout
+package im.vector.riotx.features.workers.signout
 
 import android.content.Context
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.FragmentActivity
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.core.extensions.vectorComponent
-import im.vector.riotredesign.features.MainActivity
-import im.vector.riotredesign.features.notifications.NotificationDrawerManager
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.core.extensions.vectorComponent
+import im.vector.riotx.features.MainActivity
+import im.vector.riotx.features.notifications.NotificationDrawerManager
 
 class SignOutUiWorker(private val activity: FragmentActivity) {
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/workers/signout/SignOutViewModel.kt b/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutViewModel.kt
similarity index 98%
rename from vector/src/main/java/im/vector/riotredesign/features/workers/signout/SignOutViewModel.kt
rename to vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutViewModel.kt
index bc97574339..b48040a0ae 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/workers/signout/SignOutViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.workers.signout
+package im.vector.riotx.features.workers.signout
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
diff --git a/vector/src/main/res/layout/activity_emoji_reaction_picker.xml b/vector/src/main/res/layout/activity_emoji_reaction_picker.xml
index 475ff54c3a..ccaf149732 100644
--- a/vector/src/main/res/layout/activity_emoji_reaction_picker.xml
+++ b/vector/src/main/res/layout/activity_emoji_reaction_picker.xml
@@ -4,11 +4,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="im.vector.riotredesign.features.reactions.EmojiReactionPickerActivity">
+    tools:context="im.vector.riotx.features.reactions.EmojiReactionPickerActivity">
 
     <fragment
         android:id="@+id/fragment"
-        android:name="im.vector.riotredesign.features.reactions.EmojiChooserFragment"
+        android:name="im.vector.riotx.features.reactions.EmojiChooserFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
diff --git a/vector/src/main/res/layout/emoji_chooser_fragment.xml b/vector/src/main/res/layout/emoji_chooser_fragment.xml
index c6cc3b8000..197e7ce6ef 100644
--- a/vector/src/main/res/layout/emoji_chooser_fragment.xml
+++ b/vector/src/main/res/layout/emoji_chooser_fragment.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:scrollbars="vertical"
-    tools:context="im.vector.riotredesign.features.reactions.EmojiChooserFragment"
+    tools:context="im.vector.riotx.features.reactions.EmojiChooserFragment"
     tools:itemCount="100"
     tools:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
     tools:listitem="@layout/grid_item_emoji"
diff --git a/vector/src/main/res/layout/fragment_group_list.xml b/vector/src/main/res/layout/fragment_group_list.xml
index 5548eacc98..c371b465b6 100644
--- a/vector/src/main/res/layout/fragment_group_list.xml
+++ b/vector/src/main/res/layout/fragment_group_list.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<im.vector.riotredesign.core.platform.StateView xmlns:android="http://schemas.android.com/apk/res/android"
+<im.vector.riotx.core.platform.StateView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/stateView"
     android:layout_width="match_parent"
@@ -11,4 +11,4 @@
         android:layout_height="match_parent"
         tools:listitem="@layout/item_group" />
 
-</im.vector.riotredesign.core.platform.StateView>
+</im.vector.riotx.core.platform.StateView>
diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index 4729b15b4a..cc80bd3a16 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -57,7 +57,7 @@
         app:layout_constraintTop_toBottomOf="@id/groupToolbar"
         tools:visibility="visible" />
 
-    <im.vector.riotredesign.core.ui.views.KeysBackupBanner
+    <im.vector.riotx.core.ui.views.KeysBackupBanner
         android:id="@+id/homeKeysBackupBanner"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
index cf367eeeb0..57f3f488c6 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
@@ -81,7 +81,7 @@
             app:layout_constraintStart_toEndOf="@id/keys_backup_passphrase_enter_til"
             app:layout_constraintTop_toTopOf="@id/keys_backup_passphrase_enter_til" />
 
-        <im.vector.riotredesign.core.ui.views.PasswordStrengthBar
+        <im.vector.riotx.core.ui.views.PasswordStrengthBar
             android:id="@+id/keys_backup_passphrase_security_progress"
             android:layout_width="0dp"
             android:layout_height="4dp"
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index d1f6f76dc6..95093ca8d3 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -81,7 +81,7 @@
         tools:listitem="@layout/item_timeline_event_base" />
 
 
-    <im.vector.riotredesign.features.home.room.detail.composer.TextComposerView
+    <im.vector.riotx.features.home.room.detail.composer.TextComposerView
         android:id="@+id/composerLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -89,7 +89,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <im.vector.riotredesign.features.invite.VectorInviteView
+    <im.vector.riotx.features.invite.VectorInviteView
         android:id="@+id/inviteView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/fragment_room_list.xml b/vector/src/main/res/layout/fragment_room_list.xml
index 729afb2b30..d4b6bd0f4c 100644
--- a/vector/src/main/res/layout/fragment_room_list.xml
+++ b/vector/src/main/res/layout/fragment_room_list.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<im.vector.riotredesign.core.platform.StateView xmlns:android="http://schemas.android.com/apk/res/android"
+<im.vector.riotx.core.platform.StateView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/stateView"
@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <im.vector.riotredesign.features.home.room.list.widget.FabMenuView
+    <im.vector.riotx.features.home.room.list.widget.FabMenuView
         android:id="@+id/createChatFabMenu"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -50,4 +50,4 @@
         tools:layout_marginEnd="144dp"
         tools:visibility="visible" />
 
-</im.vector.riotredesign.core.platform.StateView>
+</im.vector.riotx.core.platform.StateView>
diff --git a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
index 6a988346e5..d6a154da34 100644
--- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
+++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
@@ -118,7 +118,7 @@
                     tools:text="Error"
                     tools:visibility="visible" />
 
-                <im.vector.riotredesign.core.platform.ButtonStateView
+                <im.vector.riotx.core.platform.ButtonStateView
                     android:id="@+id/roomPreviewNoPreviewJoin"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/grid_item_emoji.xml b/vector/src/main/res/layout/grid_item_emoji.xml
index 8500fa49ec..6fc4ada972 100644
--- a/vector/src/main/res/layout/grid_item_emoji.xml
+++ b/vector/src/main/res/layout/grid_item_emoji.xml
@@ -15,7 +15,7 @@
         tools:visibility="visible"
         android:background="@drawable/circle" />
 
-    <im.vector.riotredesign.features.reactions.EmojiDrawView
+    <im.vector.riotx.features.reactions.EmojiDrawView
         android:id="@+id/grid_item_emoji_text"
         android:layout_width="40dp"
         android:layout_height="40dp"
diff --git a/vector/src/main/res/layout/item_group.xml b/vector/src/main/res/layout/item_group.xml
index a848ec5dcf..03468e9c2f 100644
--- a/vector/src/main/res/layout/item_group.xml
+++ b/vector/src/main/res/layout/item_group.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<im.vector.riotredesign.core.platform.CheckableConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<im.vector.riotx.core.platform.CheckableConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemGroupLayout"
@@ -61,4 +61,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-</im.vector.riotredesign.core.platform.CheckableConstraintLayout>
\ No newline at end of file
+</im.vector.riotx.core.platform.CheckableConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml
index 5c28baad5d..c605a2fe90 100644
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@@ -102,7 +102,7 @@
         app:layout_constraintStart_toEndOf="@+id/itemPublicRoomMembersCount"
         tools:text="@sample/matrix.json/data/roomAlias" />
 
-    <im.vector.riotredesign.core.platform.ButtonStateView
+    <im.vector.riotx.core.platform.ButtonStateView
         android:id="@+id/itemPublicRoomButtonState"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index 1166bbffd1..b8739dbfa0 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -52,7 +52,7 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@sample/matrix.json/data/displayName" />
 
-    <im.vector.riotredesign.features.home.room.list.UnreadCounterBadgeView
+    <im.vector.riotx.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/roomUnreadCounterBadgeView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/item_room_category.xml b/vector/src/main/res/layout/item_room_category.xml
index c6bb55f83f..e982a32009 100644
--- a/vector/src/main/res/layout/item_room_category.xml
+++ b/vector/src/main/res/layout/item_room_category.xml
@@ -33,7 +33,7 @@
         android:textSize="14sp"
         tools:text="@string/room_participants_header_direct_chats" />
 
-    <im.vector.riotredesign.features.home.room.list.UnreadCounterBadgeView
+    <im.vector.riotx.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/roomCategoryUnreadCounterBadgeView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/item_room_invitation.xml b/vector/src/main/res/layout/item_room_invitation.xml
index 2737eba410..67e6fc6ac4 100644
--- a/vector/src/main/res/layout/item_room_invitation.xml
+++ b/vector/src/main/res/layout/item_room_invitation.xml
@@ -77,7 +77,7 @@
         app:layout_constraintTop_toBottomOf="@+id/roomInvitationSubTitle"
         tools:layout_marginStart="120dp" />
 
-    <im.vector.riotredesign.core.platform.ButtonStateView
+    <im.vector.riotx.core.platform.ButtonStateView
         android:id="@+id/roomInvitationAccept"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -91,7 +91,7 @@
         app:layout_constraintEnd_toEndOf="@+id/roomInvitationNameView"
         app:layout_constraintTop_toBottomOf="@+id/roomLastEventBottomSpace" />
 
-    <im.vector.riotredesign.core.platform.ButtonStateView
+    <im.vector.riotx.core.platform.ButtonStateView
         android:id="@+id/roomInvitationReject"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index 9fda155fd9..7f15c60bfc 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -7,7 +7,7 @@
     android:addStatesFromChildren="true"
     android:background="?attr/selectableItemBackground">
 
-    <im.vector.riotredesign.core.platform.CheckableView
+    <im.vector.riotx.core.platform.CheckableView
         android:id="@+id/messageSelectedBackground"
         android:layout_width="0dp"
         android:layout_height="0dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml b/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
index ebd6e31773..004428eccf 100644
--- a/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
@@ -7,7 +7,7 @@
     android:addStatesFromChildren="true"
     android:background="?attr/selectableItemBackground">
 
-    <im.vector.riotredesign.core.platform.CheckableView
+    <im.vector.riotx.core.platform.CheckableView
         android:id="@+id/messageSelectedBackground"
         android:layout_width="0dp"
         android:layout_height="0dp"
diff --git a/vector/src/main/res/layout/item_timeline_event_bottom_reactions_stub.xml b/vector/src/main/res/layout/item_timeline_event_bottom_reactions_stub.xml
index 13ca78ae48..fb03135212 100644
--- a/vector/src/main/res/layout/item_timeline_event_bottom_reactions_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_bottom_reactions_stub.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <im.vector.riotredesign.features.reactions.widget.ReactionButton
+    <im.vector.riotx.features.reactions.widget.ReactionButton
         android:id="@+id/messageBottomReaction1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -16,7 +16,7 @@
         tools:reaction_count="3"
         tools:visibility="visible" />
 
-    <im.vector.riotredesign.features.reactions.widget.ReactionButton
+    <im.vector.riotx.features.reactions.widget.ReactionButton
         android:id="@+id/messageBottomReaction2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -26,7 +26,7 @@
         tools:reaction_count="10"
         tools:visibility="visible" />
 
-    <im.vector.riotredesign.features.reactions.widget.ReactionButton
+    <im.vector.riotx.features.reactions.widget.ReactionButton
         android:id="@+id/messageBottomReaction3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
         tools:ignore="MissingConstraints"
         tools:visibility="visible" />
 
-    <im.vector.riotredesign.features.reactions.widget.ReactionButton
+    <im.vector.riotx.features.reactions.widget.ReactionButton
         android:id="@+id/messageBottomReaction4"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -44,7 +44,7 @@
         tools:ignore="MissingConstraints"
         tools:visibility="visible" />
 
-    <im.vector.riotredesign.features.reactions.widget.ReactionButton
+    <im.vector.riotx.features.reactions.widget.ReactionButton
         android:id="@+id/messageBottomReaction5"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -54,7 +54,7 @@
         tools:visibility="visible" />
 
 
-    <im.vector.riotredesign.features.reactions.widget.ReactionButton
+    <im.vector.riotx.features.reactions.widget.ReactionButton
         android:id="@+id/messageBottomReaction6"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -64,7 +64,7 @@
         tools:visibility="visible" />
 
 
-    <im.vector.riotredesign.features.reactions.widget.ReactionButton
+    <im.vector.riotx.features.reactions.widget.ReactionButton
         android:id="@+id/messageBottomReaction7"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -73,7 +73,7 @@
         tools:ignore="MissingConstraints"
         tools:visibility="visible" />
 
-    <im.vector.riotredesign.features.reactions.widget.ReactionButton
+    <im.vector.riotx.features.reactions.widget.ReactionButton
         android:id="@+id/messageBottomReaction8"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/reaction_button.xml b/vector/src/main/res/layout/reaction_button.xml
index 6c16929788..3d2cd3c87a 100644
--- a/vector/src/main/res/layout/reaction_button.xml
+++ b/vector/src/main/res/layout/reaction_button.xml
@@ -16,7 +16,7 @@
         <!--android:layout_height="match_parent"-->
         <!--android:background="@drawable/rounded_rect_shape" />-->
 
-    <im.vector.riotredesign.features.reactions.widget.DotsView
+    <im.vector.riotx.features.reactions.widget.DotsView
         android:id="@+id/dots"
         android:layout_width="30dp"
         android:layout_height="30dp"
@@ -26,7 +26,7 @@
         app:layout_constraintStart_toStartOf="@+id/reactionText"
         app:layout_constraintTop_toTopOf="@+id/reactionText" />
 
-    <im.vector.riotredesign.features.reactions.widget.CircleView
+    <im.vector.riotx.features.reactions.widget.CircleView
         android:id="@+id/circle"
         android:layout_width="14dp"
         android:layout_height="14dp"
diff --git a/vector/src/main/res/layout/vector_home_badge_unread_layout.xml b/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
index 60be539d69..a864c8ffa7 100644
--- a/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
+++ b/vector/src/main/res/layout/vector_home_badge_unread_layout.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <im.vector.riotredesign.features.home.room.list.UnreadCounterBadgeView
+    <im.vector.riotx.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/actionUnreadCounterBadgeView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/xml/vector_settings_flair.xml b/vector/src/main/res/xml/vector_settings_flair.xml
index 8395ab3253..9d074cbcf7 100644
--- a/vector/src/main/res/xml/vector_settings_flair.xml
+++ b/vector/src/main/res/xml/vector_settings_flair.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceCategory
+    <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_GROUPS_FLAIR_KEY"
         android:title="@string/settings_flair" />
 
diff --git a/vector/src/main/res/xml/vector_settings_general.xml b/vector/src/main/res/xml/vector_settings_general.xml
index 8bc15fefac..b289a9b2cc 100644
--- a/vector/src/main/res/xml/vector_settings_general.xml
+++ b/vector/src/main/res/xml/vector_settings_general.xml
@@ -4,20 +4,20 @@
     xmlns:tools="http://schemas.android.com/tools">
 
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceCategory
+    <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_USER_SETTINGS_PREFERENCE_KEY"
         android:title="@string/settings_user_settings">
 
-        <im.vector.riotredesign.core.preference.UserAvatarPreference
+        <im.vector.riotx.core.preference.UserAvatarPreference
             android:key="SETTINGS_PROFILE_PICTURE_PREFERENCE_KEY"
             android:title="@string/settings_profile_picture" />
 
-        <im.vector.riotredesign.core.preference.VectorEditTextPreference
+        <im.vector.riotx.core.preference.VectorEditTextPreference
             android:key="SETTINGS_DISPLAY_NAME_PREFERENCE_KEY"
             android:summary="@string/settings_display_name"
             android:title="@string/settings_display_name" />
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_CHANGE_PASSWORD_PREFERENCE_KEY"
             android:summary="@string/password_hint"
             android:title="@string/settings_password" />
@@ -25,7 +25,7 @@
         <!-- Email will be added here -->
 
         <!-- Note: inputType does not work, it is set also in code, as well as iconTint -->
-        <im.vector.riotredesign.core.preference.VectorEditTextPreference
+        <im.vector.riotx.core.preference.VectorEditTextPreference
             android:icon="@drawable/ic_add_black"
             android:inputType="textEmailAddress"
             android:key="ADD_EMAIL_PREFERENCE_KEY"
@@ -36,80 +36,80 @@
         <!-- Phone will be added here -->
 
         <!-- Note: iconTint does not work, it is also done in code -->
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:icon="@drawable/ic_add_black"
             android:key="ADD_PHONE_NUMBER_PREFERENCE_KEY"
             android:order="200"
             android:title="@string/settings_add_phone_number"
             app:iconTint="?attr/vctr_settings_icon_tint_color" />
 
-    </im.vector.riotredesign.core.preference.VectorPreferenceCategory>
+    </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceDivider />
+    <im.vector.riotx.core.preference.VectorPreferenceDivider />
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceCategory
+    <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_CONTACT_PREFERENCE_KEYS"
         android:title="@string/settings_contact">
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:key="CONTACT_BOOK_ACCESS_KEY"
             android:title="@string/settings_contacts_app_permission" />
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:dialogTitle="@string/settings_select_country"
             android:key="SETTINGS_CONTACTS_PHONEBOOK_COUNTRY_PREFERENCE_KEY"
             android:title="@string/settings_contacts_phonebook_country" />
 
-    </im.vector.riotredesign.core.preference.VectorPreferenceCategory>
+    </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceDivider />
+    <im.vector.riotx.core.preference.VectorPreferenceDivider />
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceCategory android:title="@string/settings_advanced">
+    <im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_advanced">
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_LOGGED_IN_PREFERENCE_KEY"
             android:title="@string/settings_logged_in"
             tools:summary="\@user:matrix.org" />
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_HOME_SERVER_PREFERENCE_KEY"
             android:title="@string/settings_home_server"
             tools:summary="@string/default_hs_server_url" />
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_IDENTITY_SERVER_PREFERENCE_KEY"
             android:title="@string/settings_identity_server"
             tools:summary="@string/default_identity_server_url" />
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_CLEAR_MEDIA_CACHE_PREFERENCE_KEY"
             android:title="@string/settings_clear_media_cache" />
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_CLEAR_CACHE_PREFERENCE_KEY"
             android:title="@string/settings_clear_cache" />
 
-    </im.vector.riotredesign.core.preference.VectorPreferenceCategory>
+    </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceDivider />
+    <im.vector.riotx.core.preference.VectorPreferenceDivider />
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceCategory
+    <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:title="@string/action_sign_out">
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_SIGN_OUT_KEY"
             android:title="@string/action_sign_out" />
 
-    </im.vector.riotredesign.core.preference.VectorPreferenceCategory>
+    </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceCategory
+    <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_DEACTIVATE_ACCOUNT_CATEGORY_KEY"
         android:title="@string/settings_deactivate_account_section">
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_DEACTIVATE_ACCOUNT_KEY"
             android:title="@string/settings_deactivate_my_account" />
 
-    </im.vector.riotredesign.core.preference.VectorPreferenceCategory>
+    </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_help_about.xml b/vector/src/main/res/xml/vector_settings_help_about.xml
index 6774f934ba..49c96a3603 100644
--- a/vector/src/main/res/xml/vector_settings_help_about.xml
+++ b/vector/src/main/res/xml/vector_settings_help_about.xml
@@ -2,50 +2,50 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceCategory
+    <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_OTHERS_PREFERENCE_KEY"
         android:title="@string/settings_other">
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="APP_INFO_LINK_PREFERENCE_KEY"
             android:summary="@string/settings_app_info_link_summary"
             android:title="@string/settings_app_info_link_title" />
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_VERSION_PREFERENCE_KEY"
             android:title="@string/settings_version"
             tools:summary="1.2.3" />
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_SDK_VERSION_PREFERENCE_KEY"
             android:title="@string/settings_sdk_version"
             tools:summary="4.5.6" />
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_OLM_VERSION_PREFERENCE_KEY"
             android:title="@string/settings_olm_version"
             tools:summary="7.8.9" />
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_COPYRIGHT_PREFERENCE_KEY"
             android:title="@string/settings_copyright" />
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_APP_TERM_CONDITIONS_PREFERENCE_KEY"
             android:title="@string/settings_app_term_conditions" />
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_PRIVACY_POLICY_PREFERENCE_KEY"
             android:title="@string/settings_privacy_policy" />
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_THIRD_PARTY_NOTICES_PREFERENCE_KEY"
             android:title="@string/settings_third_party_notices" />
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_OTHER_THIRD_PARTY_NOTICES_PREFERENCE_KEY"
             android:title="@string/settings_other_third_party_notices" />
 
-    </im.vector.riotredesign.core.preference.VectorPreferenceCategory>
+    </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_ignored_users.xml b/vector/src/main/res/xml/vector_settings_ignored_users.xml
index 15223b635a..4ad8aed5b6 100644
--- a/vector/src/main/res/xml/vector_settings_ignored_users.xml
+++ b/vector/src/main/res/xml/vector_settings_ignored_users.xml
@@ -3,11 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceCategory
+    <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_IGNORED_USERS_PREFERENCE_KEY"
         android:title="@string/settings_ignored_users" />
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceDivider android:key="SETTINGS_IGNORE_USERS_DIVIDER_PREFERENCE_KEY" />
+    <im.vector.riotx.core.preference.VectorPreferenceDivider android:key="SETTINGS_IGNORE_USERS_DIVIDER_PREFERENCE_KEY" />
 
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_labs.xml b/vector/src/main/res/xml/vector_settings_labs.xml
index 6c1315dcfe..66eb3f393d 100644
--- a/vector/src/main/res/xml/vector_settings_labs.xml
+++ b/vector/src/main/res/xml/vector_settings_labs.xml
@@ -3,44 +3,44 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <!--<im.vector.riotredesign.core.preference.VectorPreferenceCategory-->
+    <!--<im.vector.riotx.core.preference.VectorPreferenceCategory-->
         <!--android:key="SETTINGS_LABS_PREFERENCE_KEY"-->
         <!--android:title="@string/room_settings_labs_pref_title">-->
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:focusable="false"
             android:key="labs_warning"
             android:summary="@string/room_settings_labs_warning_message" />
 
-        <!--<im.vector.riotredesign.core.preference.VectorSwitchPreference-->
+        <!--<im.vector.riotx.core.preference.VectorSwitchPreference-->
             <!--android:key="SETTINGS_ROOM_SETTINGS_LABS_END_TO_END_PREFERENCE_KEY"-->
             <!--android:title="@string/room_settings_labs_end_to_end" />-->
 
-        <!--<im.vector.riotredesign.core.preference.VectorPreference-->
+        <!--<im.vector.riotx.core.preference.VectorPreference-->
             <!--android:focusable="false"-->
             <!--android:key="SETTINGS_ROOM_SETTINGS_LABS_END_TO_END_IS_ACTIVE_PREFERENCE_KEY"-->
             <!--android:title="@string/room_settings_labs_end_to_end_is_active" />-->
 
-        <!--<im.vector.riotredesign.core.preference.VectorSwitchPreference-->
+        <!--<im.vector.riotx.core.preference.VectorSwitchPreference-->
             <!--android:key="SETTINGS_DATA_SAVE_MODE_PREFERENCE_KEY"-->
             <!--android:summary="@string/settings_data_save_mode_summary"-->
             <!--android:title="@string/settings_data_save_mode" />-->
 
-        <!--<im.vector.riotredesign.core.preference.VectorSwitchPreference-->
+        <!--<im.vector.riotx.core.preference.VectorSwitchPreference-->
             <!--android:defaultValue="true"-->
             <!--android:key="SETTINGS_USE_JITSI_CONF_PREFERENCE_KEY"-->
             <!--android:title="@string/settings_labs_create_conference_with_jitsi" />-->
 
-        <!--<im.vector.riotredesign.core.preference.VectorSwitchPreference-->
+        <!--<im.vector.riotx.core.preference.VectorSwitchPreference-->
             <!--android:key="SETTINGS_ENABLE_SEND_VOICE_FEATURE_PREFERENCE_KEY"-->
             <!--android:summary="@string/settings_labs_enable_send_voice_summary"-->
             <!--android:title="@string/settings_labs_enable_send_voice" />-->
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:key="SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY"
             android:defaultValue="false"
             android:title="@string/settings_labs_show_hidden_events_in_timeline" />
 
-    <!--</im.vector.riotredesign.core.preference.VectorPreferenceCategory>-->
+    <!--</im.vector.riotx.core.preference.VectorPreferenceCategory>-->
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_notification_advanced_preferences.xml b/vector/src/main/res/xml/vector_settings_notification_advanced_preferences.xml
index bb5de919c5..32b6a2b499 100644
--- a/vector/src/main/res/xml/vector_settings_notification_advanced_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_notification_advanced_preferences.xml
@@ -1,63 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceCategory
+    <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_NOTIFICATION_LEVEL"
         android:persistent="false"
         android:title="@string/settings_notification_by_event">
 
-        <im.vector.riotredesign.core.preference.BingRulePreference
+        <im.vector.riotx.core.preference.BingRulePreference
             android:key="SETTINGS_CONTAINING_MY_DISPLAY_NAME_PREFERENCE_KEY_2"
             android:title="@string/settings_containing_my_display_name" />
 
-        <im.vector.riotredesign.core.preference.BingRulePreference
+        <im.vector.riotx.core.preference.BingRulePreference
             android:key="SETTINGS_CONTAINING_MY_USER_NAME_PREFERENCE_KEY_2"
             android:title="@string/settings_containing_my_user_name" />
 
-        <im.vector.riotredesign.core.preference.BingRulePreference
+        <im.vector.riotx.core.preference.BingRulePreference
             android:key="SETTINGS_MESSAGES_IN_ONE_TO_ONE_PREFERENCE_KEY_2"
             android:title="@string/settings_messages_in_one_to_one" />
 
-        <im.vector.riotredesign.core.preference.BingRulePreference
+        <im.vector.riotx.core.preference.BingRulePreference
             android:key="SETTINGS_MESSAGES_IN_GROUP_CHAT_PREFERENCE_KEY_2"
             android:title="@string/settings_messages_in_group_chat" />
 
-        <im.vector.riotredesign.core.preference.BingRulePreference
+        <im.vector.riotx.core.preference.BingRulePreference
             android:key="SETTINGS_INVITED_TO_ROOM_PREFERENCE_KEY_2"
             android:title="@string/settings_invited_to_room" />
 
-        <im.vector.riotredesign.core.preference.BingRulePreference
+        <im.vector.riotx.core.preference.BingRulePreference
             android:key="SETTINGS_CALL_INVITATIONS_PREFERENCE_KEY_2"
             android:title="@string/settings_call_invitations" />
 
-        <im.vector.riotredesign.core.preference.BingRulePreference
+        <im.vector.riotx.core.preference.BingRulePreference
             android:key="SETTINGS_MESSAGES_SENT_BY_BOT_PREFERENCE_KEY_2"
             android:title="@string/settings_messages_sent_by_bot" />
 
-    </im.vector.riotredesign.core.preference.VectorPreferenceCategory>
+    </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceDivider />
+    <im.vector.riotx.core.preference.VectorPreferenceDivider />
 
     <!-- For API < 26 -->
-    <im.vector.riotredesign.core.preference.VectorPreference
+    <im.vector.riotx.core.preference.VectorPreference
         android:dialogTitle="@string/settings_notification_ringtone"
         android:key="SETTINGS_NOTIFICATION_RINGTONE_SELECTION_PREFERENCE_KEY"
         android:title="@string/settings_notification_ringtone" />
 
     <!-- For API >= 26 -->
-    <im.vector.riotredesign.core.preference.VectorPreference
+    <im.vector.riotx.core.preference.VectorPreference
         android:key="SETTINGS_SYSTEM_NOISY_NOTIFICATION_PREFERENCE_KEY"
         android:persistent="false"
         android:summary="@string/settings_system_preferences_summary"
         android:title="@string/settings_noisy_notifications_preferences" />
 
-    <im.vector.riotredesign.core.preference.VectorPreference
+    <im.vector.riotx.core.preference.VectorPreference
         android:key="SETTINGS_SYSTEM_SILENT_NOTIFICATION_PREFERENCE_KEY"
         android:persistent="false"
         android:summary="@string/settings_system_preferences_summary"
         android:title="@string/settings_silent_notifications_preferences" />
 
-    <im.vector.riotredesign.core.preference.VectorPreference
+    <im.vector.riotx.core.preference.VectorPreference
         android:key="SETTINGS_SYSTEM_CALL_NOTIFICATION_PREFERENCE_KEY"
         android:persistent="false"
         android:summary="@string/settings_system_preferences_summary"
diff --git a/vector/src/main/res/xml/vector_settings_notifications.xml b/vector/src/main/res/xml/vector_settings_notifications.xml
index 7ed78c07b7..26f204c17c 100644
--- a/vector/src/main/res/xml/vector_settings_notifications.xml
+++ b/vector/src/main/res/xml/vector_settings_notifications.xml
@@ -2,27 +2,27 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceCategory
+    <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_NOTIFICATIONS_KEY"
         android:title="@string/settings_notifications">
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
             android:title="@string/settings_enable_all_notif" />
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
             android:key="SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY"
             android:title="@string/settings_enable_this_device" />
 
-        <!--<im.vector.riotredesign.core.preference.VectorSwitchPreference-->
+        <!--<im.vector.riotx.core.preference.VectorSwitchPreference-->
         <!--android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"-->
         <!--android:key="SETTINGS_TURN_SCREEN_ON_PREFERENCE_KEY"-->
         <!--android:title="@string/settings_turn_screen_on" />-->
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:dependency="SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY"
             android:enabled="false"
             android:key="SETTINGS_NOTIFICATION_ADVANCED_PREFERENCE_KEY"
@@ -32,62 +32,62 @@
             android:visibility="gone"
             app:fragment="im.vector.fragments.VectorSettingsNotificationsAdvancedFragment" />
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_NOTIFICATION_TROUBLESHOOT_PREFERENCE_KEY"
             android:title="@string/settings_notification_troubleshoot"
-            app:fragment="im.vector.riotredesign.features.settings.VectorSettingsNotificationsTroubleshootFragment" />
+            app:fragment="im.vector.riotx.features.settings.VectorSettingsNotificationsTroubleshootFragment" />
 
-    </im.vector.riotredesign.core.preference.VectorPreferenceCategory>
+    </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
 
-    <!--im.vector.riotredesign.core.preference.VectorPreferenceCategory
+    <!--im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_BACKGROUND_SYNC_PREFERENCE_KEY"
         android:title="@string/settings_background_sync">
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_START_ON_BOOT_PREFERENCE_KEY"
             android:title="@string/settings_start_on_boot" />
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:key="SETTINGS_ENABLE_BACKGROUND_SYNC_PREFERENCE_KEY"
             android:title="@string/settings_enable_background_sync" />
 
-        <im.vector.riotredesign.core.preference.VectorEditTextPreference
+        <im.vector.riotx.core.preference.VectorEditTextPreference
             android:dependency="SETTINGS_ENABLE_BACKGROUND_SYNC_PREFERENCE_KEY"
             android:key="SETTINGS_SET_SYNC_TIMEOUT_PREFERENCE_KEY"
             android:numeric="integer"
             android:title="@string/settings_set_sync_timeout" />
 
-        <im.vector.riotredesign.core.preference.VectorEditTextPreference
+        <im.vector.riotx.core.preference.VectorEditTextPreference
             android:dependency="SETTINGS_ENABLE_BACKGROUND_SYNC_PREFERENCE_KEY"
             android:key="SETTINGS_SET_SYNC_DELAY_PREFERENCE_KEY"
             android:numeric="integer"
             android:title="@string/settings_set_sync_delay" />
 
-    </im.vector.riotredesign.core.preference.VectorPreferenceCategory>
+    </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceDivider android:key="SETTINGS_BACKGROUND_SYNC_DIVIDER_PREFERENCE_KEY" />
+    <im.vector.riotx.core.preference.VectorPreferenceDivider android:key="SETTINGS_BACKGROUND_SYNC_DIVIDER_PREFERENCE_KEY" />
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceCategory
+    <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_NOTIFICATIONS_TARGETS_PREFERENCE_KEY"
         android:title="@string/settings_notifications_targets" />
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceDivider android:key="SETTINGS_NOTIFICATIONS_TARGET_DIVIDER_PREFERENCE_KEY" /-->
+    <im.vector.riotx.core.preference.VectorPreferenceDivider android:key="SETTINGS_NOTIFICATIONS_TARGET_DIVIDER_PREFERENCE_KEY" /-->
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceCategory android:title="@string/settings_expert">
+    <im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_expert">
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:layout_width="match_parent"
             android:persistent="false"
             android:title="@string/settings_notifications_targets"
-            app:fragment="im.vector.riotredesign.features.settings.push.PushGatewaysFragment" />
+            app:fragment="im.vector.riotx.features.settings.push.PushGatewaysFragment" />
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:layout_width="match_parent"
             android:persistent="false"
             android:title="@string/settings_push_rules"
-            app:fragment="im.vector.riotredesign.features.settings.push.PushRulesFragment" />
+            app:fragment="im.vector.riotx.features.settings.push.PushRulesFragment" />
 
-    </im.vector.riotredesign.core.preference.VectorPreferenceCategory>
+    </im.vector.riotx.core.preference.VectorPreferenceCategory>
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml
index a8e4b08fc0..11209b5345 100644
--- a/vector/src/main/res/xml/vector_settings_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_preferences.xml
@@ -3,16 +3,16 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceCategory
+    <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_USER_INTERFACE_KEY"
         android:title="@string/settings_user_interface">
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:dialogTitle="@string/settings_select_language"
             android:key="SETTINGS_INTERFACE_LANGUAGE_PREFERENCE_KEY"
             android:title="@string/settings_interface_language" />
 
-        <im.vector.riotredesign.core.preference.VectorListPreference
+        <im.vector.riotx.core.preference.VectorListPreference
             android:defaultValue="light"
             android:entries="@array/theme_entries"
             android:entryValues="@array/theme_values"
@@ -21,65 +21,65 @@
             android:title="@string/settings_theme"
             app:iconSpaceReserved="false" />
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:dialogTitle="@string/font_size"
             android:key="SETTINGS_INTERFACE_TEXT_SIZE_KEY"
             android:title="@string/font_size" />
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_SHOW_URL_PREVIEW_KEY"
             android:summary="@string/settings_inline_url_preview_summary"
             android:title="@string/settings_inline_url_preview" />
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_SEND_TYPING_NOTIF_KEY"
             android:summary="@string/settings_send_typing_notifs_summary"
             android:title="@string/settings_send_typing_notifs" />
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_ENABLE_MARKDOWN_KEY"
             android:summary="@string/settings_send_markdown_summary"
             android:title="@string/settings_send_markdown" />
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:key="SETTINGS_ALWAYS_SHOW_TIMESTAMPS_KEY"
             android:title="@string/settings_always_show_timestamps" />
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:key="SETTINGS_12_24_TIMESTAMPS_KEY"
             android:title="@string/settings_12_24_timestamps" />
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_SHOW_READ_RECEIPTS_KEY"
             android:summary="@string/settings_show_read_receipts_summary"
             android:title="@string/settings_show_read_receipts" />
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_SHOW_JOIN_LEAVE_MESSAGES_KEY"
             android:summary="@string/settings_show_join_leave_messages_summary"
             android:title="@string/settings_show_join_leave_messages" />
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_SHOW_AVATAR_DISPLAY_NAME_CHANGES_MESSAGES_KEY"
             android:summary="@string/settings_show_avatar_display_name_changes_messages_summary"
             android:title="@string/settings_show_avatar_display_name_changes_messages" />
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:key="SETTINGS_VIBRATE_ON_MENTION_KEY"
             android:title="@string/settings_vibrate_on_mention" />
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:key="SETTINGS_SEND_MESSAGE_WITH_ENTER"
             android:summary="@string/settings_send_message_with_enter_summary"
             android:title="@string/settings_send_message_with_enter" />
 
-        <im.vector.riotredesign.core.preference.VectorListPreference
+        <im.vector.riotx.core.preference.VectorListPreference
             android:defaultValue="always"
             android:entries="@array/show_info_area_entries"
             android:entryValues="@array/show_info_area_values"
@@ -87,50 +87,50 @@
             android:summary="%s"
             android:title="@string/settings_info_area_show" />
 
-    </im.vector.riotredesign.core.preference.VectorPreferenceCategory>
+    </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceDivider />
+    <im.vector.riotx.core.preference.VectorPreferenceDivider />
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceCategory
+    <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_HOME_DISPLAY_KEY"
         android:title="@string/settings_home_display">
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_PIN_MISSED_NOTIFICATIONS_PREFERENCE_KEY"
             android:title="@string/settings_pin_missed_notifications" />
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_PIN_UNREAD_MESSAGES_PREFERENCE_KEY"
             android:title="@string/settings_pin_unread_messages" />
 
-    </im.vector.riotredesign.core.preference.VectorPreferenceCategory>
+    </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceDivider />
+    <im.vector.riotx.core.preference.VectorPreferenceDivider />
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceCategory android:title="@string/settings_media">
+    <im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_media">
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_MEDIA_SAVING_PERIOD_KEY"
             android:title="@string/settings_keep_media" />
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:key="SETTINGS_USE_NATIVE_CAMERA_PREFERENCE_KEY"
             android:summary="@string/settings_labs_native_camera_summary"
             android:title="@string/settings_labs_native_camera" />
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_PLAY_SHUTTER_SOUND_KEY"
 
             android:title="@string/settings_play_shutter_sound" />
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:key="SETTINGS_PREVIEW_MEDIA_BEFORE_SENDING_KEY"
             android:title="@string/settings_preview_media_before_sending" />
 
-        <im.vector.riotredesign.core.preference.VectorListPreference
+        <im.vector.riotx.core.preference.VectorListPreference
             android:defaultValue="0"
             android:entries="@array/compression_levels"
             android:entryValues="@array/compression_level_values"
@@ -138,7 +138,7 @@
             android:summary="%s"
             android:title="@string/settings_default_compression" />
 
-        <im.vector.riotredesign.core.preference.VectorListPreference
+        <im.vector.riotx.core.preference.VectorListPreference
             android:defaultValue="0"
             android:entries="@array/media_sources"
             android:entryValues="@array/media_source_values"
@@ -146,6 +146,6 @@
             android:summary="%s"
             android:title="@string/settings_default_media_source" />
 
-    </im.vector.riotredesign.core.preference.VectorPreferenceCategory>
+    </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_root.xml b/vector/src/main/res/xml/vector_settings_root.xml
index 2baad7616c..e0cb4f778b 100644
--- a/vector/src/main/res/xml/vector_settings_root.xml
+++ b/vector/src/main/res/xml/vector_settings_root.xml
@@ -2,62 +2,62 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <im.vector.riotredesign.core.preference.VectorPreference
+    <im.vector.riotx.core.preference.VectorPreference
         android:layout_width="match_parent"
         android:icon="@drawable/ic_settings_root_general"
         android:title="@string/settings_general_title"
-        app:fragment="im.vector.riotredesign.features.settings.VectorSettingsGeneralFragment" />
+        app:fragment="im.vector.riotx.features.settings.VectorSettingsGeneralFragment" />
 
-    <im.vector.riotredesign.core.preference.VectorPreference
+    <im.vector.riotx.core.preference.VectorPreference
         android:layout_width="match_parent"
         android:enabled="@bool/false_not_implemented"
         android:icon="@drawable/ic_settings_root_flair"
         android:title="@string/settings_flair"
-        app:fragment="im.vector.riotredesign.features.settings.VectorSettingsFlairFragment" />
+        app:fragment="im.vector.riotx.features.settings.VectorSettingsFlairFragment" />
 
-    <im.vector.riotredesign.core.preference.VectorPreference
+    <im.vector.riotx.core.preference.VectorPreference
         android:layout_width="match_parent"
         android:icon="@drawable/ic_settings_root_notification"
         android:key="SETTINGS_NOTIFICATIONS_KEY"
         android:title="@string/settings_notifications"
-        app:fragment="im.vector.riotredesign.features.settings.VectorSettingsNotificationPreferenceFragment" />
+        app:fragment="im.vector.riotx.features.settings.VectorSettingsNotificationPreferenceFragment" />
 
-    <im.vector.riotredesign.core.preference.VectorPreference
+    <im.vector.riotx.core.preference.VectorPreference
         android:layout_width="match_parent"
         android:icon="@drawable/ic_settings_root_preferences"
         android:title="@string/settings_preferences"
-        app:fragment="im.vector.riotredesign.features.settings.VectorSettingsPreferencesFragment" />
+        app:fragment="im.vector.riotx.features.settings.VectorSettingsPreferencesFragment" />
 
-    <im.vector.riotredesign.core.preference.VectorPreference
+    <im.vector.riotx.core.preference.VectorPreference
         android:layout_width="match_parent"
         android:enabled="@bool/false_not_implemented"
         android:icon="@drawable/ic_settings_root_call"
         android:title="@string/preference_voice_and_video"
-        app:fragment="im.vector.riotredesign.features.settings.VectorSettingsVoiceVideoFragment" />
+        app:fragment="im.vector.riotx.features.settings.VectorSettingsVoiceVideoFragment" />
 
-    <im.vector.riotredesign.core.preference.VectorPreference
+    <im.vector.riotx.core.preference.VectorPreference
         android:layout_width="match_parent"
         android:enabled="@bool/false_not_implemented"
         android:icon="@drawable/ic_settings_root_ignored_users"
         android:title="@string/settings_ignored_users"
-        app:fragment="im.vector.riotredesign.features.settings.VectorSettingsIgnoredUsersFragment" />
+        app:fragment="im.vector.riotx.features.settings.VectorSettingsIgnoredUsersFragment" />
 
-    <im.vector.riotredesign.core.preference.VectorPreference
+    <im.vector.riotx.core.preference.VectorPreference
         android:layout_width="match_parent"
         android:icon="@drawable/ic_settings_root_security_privacy"
         android:title="@string/settings_security_and_privacy"
-        app:fragment="im.vector.riotredesign.features.settings.VectorSettingsSecurityPrivacyFragment" />
+        app:fragment="im.vector.riotx.features.settings.VectorSettingsSecurityPrivacyFragment" />
 
-    <im.vector.riotredesign.core.preference.VectorPreference
+    <im.vector.riotx.core.preference.VectorPreference
         android:layout_width="match_parent"
         android:icon="@drawable/ic_settings_root_labs"
         android:title="@string/room_settings_labs_pref_title"
-        app:fragment="im.vector.riotredesign.features.settings.VectorSettingsLabsFragment" />
+        app:fragment="im.vector.riotx.features.settings.VectorSettingsLabsFragment" />
 
-    <im.vector.riotredesign.core.preference.VectorPreference
+    <im.vector.riotx.core.preference.VectorPreference
         android:layout_width="match_parent"
         android:icon="@drawable/ic_settings_root_help_about"
         android:title="@string/preference_root_help_about"
-        app:fragment="im.vector.riotredesign.features.settings.VectorSettingsHelpAboutFragment" />
+        app:fragment="im.vector.riotx.features.settings.VectorSettingsHelpAboutFragment" />
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_security_privacy.xml b/vector/src/main/res/xml/vector_settings_security_privacy.xml
index 7398a0a891..9e88da34a1 100644
--- a/vector/src/main/res/xml/vector_settings_security_privacy.xml
+++ b/vector/src/main/res/xml/vector_settings_security_privacy.xml
@@ -2,74 +2,74 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- ************ Cryptography section ************ -->
-    <im.vector.riotredesign.core.preference.VectorPreferenceCategory
+    <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_CRYPTOGRAPHY_PREFERENCE_KEY"
         android:title="@string/settings_cryptography">
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_ENCRYPTION_INFORMATION_DEVICE_NAME_PREFERENCE_KEY"
             android:title="@string/encryption_information_device_name" />
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_ENCRYPTION_INFORMATION_DEVICE_ID_PREFERENCE_KEY"
             android:title="@string/encryption_information_device_id" />
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_ENCRYPTION_INFORMATION_DEVICE_KEY_PREFERENCE_KEY"
             android:title="@string/encryption_information_device_key" />
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:key="SETTINGS_ENCRYPTION_NEVER_SENT_TO_PREFERENCE_KEY"
             android:summary="@string/encryption_never_send_to_unverified_devices_summary"
             android:title="@string/encryption_never_send_to_unverified_devices_title" />
 
-    </im.vector.riotredesign.core.preference.VectorPreferenceCategory>
+    </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceDivider android:key="SETTINGS_CRYPTOGRAPHY_DIVIDER_PREFERENCE_KEY" />
+    <im.vector.riotx.core.preference.VectorPreferenceDivider android:key="SETTINGS_CRYPTOGRAPHY_DIVIDER_PREFERENCE_KEY" />
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceCategory
+    <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_CRYPTOGRAPHY_MANAGE_PREFERENCE_KEY"
         android:title="@string/settings_cryptography_manage_keys">
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_SECURE_MESSAGE_RECOVERY_PREFERENCE_KEY"
             android:persistent="false"
             android:summary="@string/encryption_settings_manage_message_recovery_summary"
             android:title="@string/encryption_message_recovery" />
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_ENCRYPTION_EXPORT_E2E_ROOM_KEYS_PREFERENCE_KEY"
             android:summary="@string/encryption_export_room_keys_summary"
             android:title="@string/encryption_export_e2e_room_keys" />
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_ENCRYPTION_IMPORT_E2E_ROOM_KEYS_PREFERENCE_KEY"
             android:summary="@string/encryption_import_room_keys_summary"
             android:title="@string/encryption_import_e2e_room_keys" />
 
-    </im.vector.riotredesign.core.preference.VectorPreferenceCategory>
+    </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceDivider android:key="SETTINGS_CRYPTOGRAPHY_MANAGE_DIVIDER_PREFERENCE_KEY" />
+    <im.vector.riotx.core.preference.VectorPreferenceDivider android:key="SETTINGS_CRYPTOGRAPHY_MANAGE_DIVIDER_PREFERENCE_KEY" />
 
     <!-- devices list: device ids + device names -->
-    <im.vector.riotredesign.core.preference.VectorPreferenceCategory
+    <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_DEVICES_LIST_PREFERENCE_KEY"
         android:title="@string/settings_devices_list" />
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceDivider android:key="SETTINGS_DEVICES_DIVIDER_PREFERENCE_KEY" />
+    <im.vector.riotx.core.preference.VectorPreferenceDivider android:key="SETTINGS_DEVICES_DIVIDER_PREFERENCE_KEY" />
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceCategory
+    <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_ANALYTICS_PREFERENCE_KEY"
         android:title="@string/settings_analytics">
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:defaultValue="false"
             android:key="SETTINGS_USE_ANALYTICS_KEY"
             android:summary="@string/settings_opt_in_of_analytics_summary"
             android:title="@string/settings_opt_in_of_analytics" />
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:key="SETTINGS_USE_RAGE_SHAKE_KEY"
             android:title="@string/send_bug_report_rage_shake" />
-    </im.vector.riotredesign.core.preference.VectorPreferenceCategory>
+    </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/vector/src/main/res/xml/vector_settings_voice_video.xml b/vector/src/main/res/xml/vector_settings_voice_video.xml
index f7a8048187..787935b884 100644
--- a/vector/src/main/res/xml/vector_settings_voice_video.xml
+++ b/vector/src/main/res/xml/vector_settings_voice_video.xml
@@ -3,19 +3,19 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <im.vector.riotredesign.core.preference.VectorPreferenceCategory android:title="@string/settings_call_category">
+    <im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_call_category">
 
-        <im.vector.riotredesign.core.preference.VectorSwitchPreference
+        <im.vector.riotx.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:disableDependentsState="true"
             android:key="SETTINGS_CALL_RINGTONE_USE_RIOT_PREFERENCE_KEY"
             android:title="@string/settings_call_ringtone_use_riot_ringtone" />
 
-        <im.vector.riotredesign.core.preference.VectorPreference
+        <im.vector.riotx.core.preference.VectorPreference
             android:dependency="SETTINGS_CALL_RINGTONE_USE_RIOT_PREFERENCE_KEY"
             android:key="SETTINGS_CALL_RINGTONE_URI_PREFERENCE_KEY"
             android:title="@string/settings_call_ringtone_title" />
 
-    </im.vector.riotredesign.core.preference.VectorPreferenceCategory>
+    </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/vector/src/release/java/im/vector/riotredesign/features/debug/DebugMenuActivity.kt b/vector/src/release/java/im/vector/riotx/features/debug/DebugMenuActivity.kt
similarity index 94%
rename from vector/src/release/java/im/vector/riotredesign/features/debug/DebugMenuActivity.kt
rename to vector/src/release/java/im/vector/riotx/features/debug/DebugMenuActivity.kt
index 8529df79f8..bd97cad9e5 100644
--- a/vector/src/release/java/im/vector/riotredesign/features/debug/DebugMenuActivity.kt
+++ b/vector/src/release/java/im/vector/riotx/features/debug/DebugMenuActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.debug
+package im.vector.riotx.features.debug
 
 import androidx.appcompat.app.AppCompatActivity
 
diff --git a/vector/src/release/java/im/vector/riotredesign/receivers/DebugReceiver.kt b/vector/src/release/java/im/vector/riotx/receivers/DebugReceiver.kt
similarity index 96%
rename from vector/src/release/java/im/vector/riotredesign/receivers/DebugReceiver.kt
rename to vector/src/release/java/im/vector/riotx/receivers/DebugReceiver.kt
index ccb2821306..89149817fc 100644
--- a/vector/src/release/java/im/vector/riotredesign/receivers/DebugReceiver.kt
+++ b/vector/src/release/java/im/vector/riotx/receivers/DebugReceiver.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.receivers
+package im.vector.riotx.receivers
 
 import android.content.BroadcastReceiver
 import android.content.Context
diff --git a/vector/src/test/java/im/vector/riotredesign/ExampleUnitTest.kt b/vector/src/test/java/im/vector/riotx/ExampleUnitTest.kt
similarity index 96%
rename from vector/src/test/java/im/vector/riotredesign/ExampleUnitTest.kt
rename to vector/src/test/java/im/vector/riotx/ExampleUnitTest.kt
index bd93628ec2..c51f642a1b 100644
--- a/vector/src/test/java/im/vector/riotredesign/ExampleUnitTest.kt
+++ b/vector/src/test/java/im/vector/riotx/ExampleUnitTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign
+package im.vector.riotx
 
 import org.junit.Test