71 files changed, 273 insertions, 279 deletions

diff --git a/.idea/.name b/.idea/.name
index d32d4d9..5f54997 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-PrivacyCentralApp
\ No newline at end of file
+AdvancedPrivacy
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 2743aac..88354c6 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -1,11 +1,11 @@
-# PrivacyCentral Development Guide
+# AdvancedPrivacy Development Guide
 This guide contains development related information to help a developer in getting better understanding of project structure.
 
 ## Architecture
-The architecture of PrivacyCentralApp is based on [clean architecture](https://blog.cleancoder.com/uncle-bob/2012/08/13/the-clean-architecture.html). For presentation layer, we use  [Model-View-Intent](http://hannesdorfmann.com/android/model-view-intent/) design pattern which is a unidirectional reactive flow pattern. We use it in conjunction to ViewModel to make our features lifecycle aware. Our android app is having single activity multiple fragments.
+The architecture of AdvancedPrivacy is based on [clean architecture](https://blog.cleancoder.com/uncle-bob/2012/08/13/the-clean-architecture.html). For presentation layer, we use  [Model-View-Intent](http://hannesdorfmann.com/android/model-view-intent/) design pattern which is a unidirectional reactive flow pattern. We use it in conjunction to ViewModel to make our features lifecycle aware. Our android app is having single activity multiple fragments.
 
 ### Clean Architecture
-Clean architecture is the building block of PrivacyCentralApp. This architecture is based on the following principles:
+Clean architecture is the building block of AdvancedPrivacy. This architecture is based on the following principles:
 1. **Independent of Frameworks**. The architecture does not depend on the existence of some library of feature laden software. This allows you to use such frameworks as tools, rather than having to cram your system into their limited constraints.
 2. **Testable**. The business rules can be tested without the UI, Database, Web Server, or any other external element.
 3. **Independent of UI**. The UI can change easily, without changing the rest of the system. A Web UI could be replaced with a console UI, for example, without changing the business rules.
@@ -19,7 +19,7 @@ Clean architecture is the building block of PrivacyCentralApp. This architecture
 <img src="art/AbstractMVI.png" width="500" height="333">
 
 MVI is used at the presentation layer of clean architecture. It is very much similar to [Redux](https://redux.js.org/) in terms of implementation and working. It has three main components.
-- **View**: This is where activities, fragments and other android components live. It is responsible for publishing user intent/actions to the model and rendering the state returned by the model. In PrivacyCentralApp, it is just an interface which is implemented by android components.
+- **View**: This is where activities, fragments and other android components live. It is responsible for publishing user intent/actions to the model and rendering the state returned by the model. In AdvancedPrivacy, it is just an interface which is implemented by android components.
 - **Intent**: In context of our app, we call them actions. These are simple data classes having any extra payload like inputs, ids etc.
 - **Model (data layer at presentation level)**: This is responsible for processing the actions, communicating with domain use-cases and mutating the state of the model. It acts as a Store from redux but for our use case, we call it a **Feature**.
 
@@ -33,7 +33,7 @@ Elements of a feature:
 2. **State**: Simple POJO (kotlin data class) representing various UI states of the application.
 3. **SingleEventProducer**: This is a function which is invoked by the reducer to publish single events (that can/should only be consumed once like displaying toast, snackbar message or sending an analytics event). This function takes action, effect, current state as input and it returns a `SingleEvent`. By default this function is null for any Feature.
 
-### Architecture Overview of PrivacyCentral App
+### Architecture Overview of AdvancedPrivacy App
 
 ![](art/privacycentral-arch.png)
 
diff --git a/README.md b/README.md
index 9d58239..35a7958 100644
--- a/README.md
+++ b/README.md
@@ -101,7 +101,6 @@ modules must be build and deployed in the following order:
   - ./gradlew :privacymodule-api:assembleRelease
   - ./gradlew --console=verbose publishToMavenLocal // To make it available locally for dev.
   - ./gradlew --console=verbose publish // To publish it on gitlab for release.
-- [privacymodule-e](../../../e_privacycentral_privacymodulese)
 - [privacymodule-tor](../../../e_privacycentral_privacymoduletor)
 - [app]
 
@@ -117,6 +116,18 @@ For building from CLI, you can execute this command:
 You can build the apk locally by using above instructions or you can download the latest stable apk from `master` branch pipeline.
 
 ### To run apk on /e/OS devices
+
+If you are running your tests on a `/test` build, the debug buildtype already sign it with the appropriate key, and without the persistant flag, to allow further updates.
+But the first time, to replace the AdvancedPrivacy app, embeded in the test build, you have to use the following commands: 
+
+    ```shell
+    adb root && adb remount
+    adb push your_advanced_privacy_debug_build.apk /system/priv-app/AdvancedPrivacy/AdvancedPrivacy.apk
+    adb shell kill -9 $(adb shell pidof -s foundation.e.advancedprivacy)
+    ```
+
+#### AdvancedPrivacy requiement against the system
+
 AdvancedPrivacy needs to be installed as system app and whitelisting in order to grant some system specific permissions. Follow these steps to make it work properly on /e/OS
 
 1. From `Developer options`, enable `Android debugging` and `Rooted debugging`
@@ -135,13 +146,13 @@ AdvancedPrivacy needs to be installed as system app and whitelisting in order to
     ```
 
 1. Push permissions whitelist.
-    - it requires the whitelisting [privapp-permissions-foundation.e.privacycentralapp.xml](privapp-permissions-foundation.e.privacycentralapp.xml) file that can be found in the project repository.
+    - it requires the whitelisting [privapp-permissions-foundation.e.advancedprivacy.xml](privapp-permissions-foundation.e.advancedprivacy.xml) file that can be found in the project repository.
     - then use the following command
         ```bash
-        adb push privapp-permissions-foundation.e.privacycentralapp.xml /system/etc/permissions/
+        adb push privapp-permissions-foundation.e.advancedprivacy.xml /system/etc/permissions/
         ```
 
-1. Allow the fake location service to run in background. Add <allow-in-power-save package="foundation.e.privacycentralapp.e" /> in the file /system/etc/permissions/platform.xml .
+1. Allow the fake location service to run in background. Add <allow-in-power-save package="foundation.e.advancedprivacy" /> in the file /system/etc/permissions/platform.xml .
    
 1. Reboot the device
     ```shell
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c155aa5..246b7c0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="foundation.e.privacycentralapp"
+    package="foundation.e.advancedprivacy"
     >
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
@@ -40,15 +40,15 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:name=".PrivacyCentralApplication"
+        android:name="foundation.e.advancedprivacy.AdvancedPrivacyApplication"
         android:persistent="${persistent}"
         android:supportsRtl="true"
-        android:theme="@style/Theme.PrivacyCentralApp"
+        android:theme="@style/Theme.AdvancedPrivacy"
         android:windowSoftInputMode="adjustResize"
         tools:replace="android:icon,android:label,android:theme"
         >
         <receiver
-            android:name=".common.BootCompletedReceiver"
+            android:name="foundation.e.advancedprivacy.common.BootCompletedReceiver"
             android:exported="true"
             >
             <intent-filter>
@@ -59,7 +59,7 @@
 
         <receiver
             android:exported="true"
-            android:name=".Widget"
+            android:name="foundation.e.advancedprivacy.Widget"
             >
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -70,14 +70,14 @@
                 android:resource="@xml/widget_info"
                 />
         </receiver>
-        <receiver android:name=".widget.WidgetCommandReceiver"
+        <receiver android:name="foundation.e.advancedprivacy.widget.WidgetCommandReceiver"
             android:exported="true">
             <intent-filter>
                 <action android:name="toggle_privacy" />
             </intent-filter>
         </receiver>
 
-        <activity android:name=".main.MainActivity"
+        <activity android:name="foundation.e.advancedprivacy.main.MainActivity"
             android:launchMode="singleTask"
             android:exported="true"
             >
@@ -87,7 +87,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".common.WarningDialog"
+            android:name="foundation.e.advancedprivacy.common.WarningDialog"
             android:noHistory="true"
             android:excludeFromRecents="true"
             android:launchMode="singleInstance"
diff --git a/app/src/main/java/foundation/e/privacycentralapp/PrivacyCentralApplication.kt b/app/src/main/java/foundation/e/advancedprivacy/AdvancedPrivacyApplication.kt
index 2f718b5..8c39eb0 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/PrivacyCentralApplication.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/AdvancedPrivacyApplication.kt
@@ -15,13 +15,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp
+package foundation.e.advancedprivacy
 
 import android.app.Application
 import com.mapbox.mapboxsdk.Mapbox
 import foundation.e.lib.telemetry.Telemetry
 
-class PrivacyCentralApplication : Application() {
+class AdvancedPrivacyApplication : Application() {
 
     // Initialize the dependency container.
     val dependencyContainer: DependencyContainer by lazy { DependencyContainer(this) }
diff --git a/app/src/main/java/foundation/e/privacycentralapp/DependencyContainer.kt b/app/src/main/java/foundation/e/advancedprivacy/DependencyContainer.kt
index aab81d5..91e2f44 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/DependencyContainer.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/DependencyContainer.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp
+package foundation.e.advancedprivacy
 
 import android.app.Application
 import android.content.Context
@@ -25,24 +25,24 @@ import androidx.lifecycle.DEFAULT_ARGS_KEY
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewmodel.CreationExtras
-import foundation.e.privacycentralapp.common.WarningDialog
-import foundation.e.privacycentralapp.data.repositories.AppListsRepository
-import foundation.e.privacycentralapp.data.repositories.LocalStateRepository
-import foundation.e.privacycentralapp.data.repositories.TrackersRepository
-import foundation.e.privacycentralapp.domain.usecases.AppListUseCase
-import foundation.e.privacycentralapp.domain.usecases.FakeLocationStateUseCase
-import foundation.e.privacycentralapp.domain.usecases.GetQuickPrivacyStateUseCase
-import foundation.e.privacycentralapp.domain.usecases.IpScramblingStateUseCase
-import foundation.e.privacycentralapp.domain.usecases.ShowFeaturesWarningUseCase
-import foundation.e.privacycentralapp.domain.usecases.TrackersStateUseCase
-import foundation.e.privacycentralapp.domain.usecases.TrackersStatisticsUseCase
-import foundation.e.privacycentralapp.dummy.CityDataSource
-import foundation.e.privacycentralapp.features.dashboard.DashboardViewModel
-import foundation.e.privacycentralapp.features.internetprivacy.InternetPrivacyViewModel
-import foundation.e.privacycentralapp.features.location.FakeLocationViewModel
-import foundation.e.privacycentralapp.features.trackers.TrackersViewModel
-import foundation.e.privacycentralapp.features.trackers.apptrackers.AppTrackersFragment
-import foundation.e.privacycentralapp.features.trackers.apptrackers.AppTrackersViewModel
+import foundation.e.advancedprivacy.common.WarningDialog
+import foundation.e.advancedprivacy.data.repositories.AppListsRepository
+import foundation.e.advancedprivacy.data.repositories.LocalStateRepository
+import foundation.e.advancedprivacy.data.repositories.TrackersRepository
+import foundation.e.advancedprivacy.domain.usecases.AppListUseCase
+import foundation.e.advancedprivacy.domain.usecases.FakeLocationStateUseCase
+import foundation.e.advancedprivacy.domain.usecases.GetQuickPrivacyStateUseCase
+import foundation.e.advancedprivacy.domain.usecases.IpScramblingStateUseCase
+import foundation.e.advancedprivacy.domain.usecases.ShowFeaturesWarningUseCase
+import foundation.e.advancedprivacy.domain.usecases.TrackersStateUseCase
+import foundation.e.advancedprivacy.domain.usecases.TrackersStatisticsUseCase
+import foundation.e.advancedprivacy.dummy.CityDataSource
+import foundation.e.advancedprivacy.features.dashboard.DashboardViewModel
+import foundation.e.advancedprivacy.features.internetprivacy.InternetPrivacyViewModel
+import foundation.e.advancedprivacy.features.location.FakeLocationViewModel
+import foundation.e.advancedprivacy.features.trackers.TrackersViewModel
+import foundation.e.advancedprivacy.features.trackers.apptrackers.AppTrackersFragment
+import foundation.e.advancedprivacy.features.trackers.apptrackers.AppTrackersViewModel
 import foundation.e.privacymodules.fakelocation.FakeLocationModule
 import foundation.e.privacymodules.ipscrambler.IpScramblerModule
 import foundation.e.privacymodules.ipscramblermodule.IIpScramblerModule
diff --git a/app/src/main/java/foundation/e/privacycentralapp/Notifications.kt b/app/src/main/java/foundation/e/advancedprivacy/Notifications.kt
index 0df3e18..68c4bd3 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/Notifications.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/Notifications.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp
+package foundation.e.advancedprivacy
 
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -25,10 +25,10 @@ import android.content.Intent
 import androidx.annotation.StringRes
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import foundation.e.privacycentralapp.domain.entities.InternetPrivacyMode
-import foundation.e.privacycentralapp.domain.entities.MainFeatures
-import foundation.e.privacycentralapp.domain.usecases.GetQuickPrivacyStateUseCase
-import foundation.e.privacycentralapp.main.MainActivity
+import foundation.e.advancedprivacy.domain.entities.InternetPrivacyMode
+import foundation.e.advancedprivacy.domain.entities.MainFeatures
+import foundation.e.advancedprivacy.domain.usecases.GetQuickPrivacyStateUseCase
+import foundation.e.advancedprivacy.main.MainActivity
 import foundation.e.privacymodules.permissions.PermissionsPrivacyModule
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.distinctUntilChanged
diff --git a/app/src/main/java/foundation/e/privacycentralapp/UpdateTrackersWorker.kt b/app/src/main/java/foundation/e/advancedprivacy/UpdateTrackersWorker.kt
index 13511da..418f75b 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/UpdateTrackersWorker.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/UpdateTrackersWorker.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp
+package foundation.e.advancedprivacy
 
 import android.content.Context
 import androidx.work.Constraints
@@ -31,7 +31,7 @@ class UpdateTrackersWorker(appContext: Context, workerParams: WorkerParameters)
     CoroutineWorker(appContext, workerParams) {
 
     override suspend fun doWork(): Result {
-        val trackersStateUseCase = (applicationContext as PrivacyCentralApplication)
+        val trackersStateUseCase = (applicationContext as AdvancedPrivacyApplication)
             .dependencyContainer.trackersStateUseCase
 
         trackersStateUseCase.updateTrackers()
diff --git a/app/src/main/java/foundation/e/privacycentralapp/common/AppsAdapter.kt b/app/src/main/java/foundation/e/advancedprivacy/common/AppsAdapter.kt
index 2fbbc34..aee1890 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/common/AppsAdapter.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/common/AppsAdapter.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.common
+package foundation.e.advancedprivacy.common
 
 import android.view.LayoutInflater
 import android.view.View
@@ -23,8 +23,8 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import foundation.e.privacycentralapp.R
-import foundation.e.privacycentralapp.domain.entities.AppWithCounts
+import foundation.e.advancedprivacy.R
+import foundation.e.advancedprivacy.domain.entities.AppWithCounts
 
 class AppsAdapter(
     private val itemsLayout: Int,
diff --git a/app/src/main/java/foundation/e/privacycentralapp/common/BootCompletedReceiver.kt b/app/src/main/java/foundation/e/advancedprivacy/common/BootCompletedReceiver.kt
index d7902ee..d73f770 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/common/BootCompletedReceiver.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/common/BootCompletedReceiver.kt
@@ -15,13 +15,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.common
+package foundation.e.advancedprivacy.common
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import foundation.e.privacycentralapp.Notifications
-import foundation.e.privacycentralapp.data.repositories.LocalStateRepository
+import foundation.e.advancedprivacy.Notifications
+import foundation.e.advancedprivacy.data.repositories.LocalStateRepository
 
 class BootCompletedReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent?) {
diff --git a/app/src/main/java/foundation/e/privacycentralapp/common/Factory.kt b/app/src/main/java/foundation/e/advancedprivacy/common/Factory.kt
index 4c7f436..3af0b37 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/common/Factory.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/common/Factory.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.common
+package foundation.e.advancedprivacy.common
 
 // Definition of a Factory interface with a function to create objects of a type
 interface Factory<T> {
diff --git a/app/src/main/java/foundation/e/privacycentralapp/common/GraphHolder.kt b/app/src/main/java/foundation/e/advancedprivacy/common/GraphHolder.kt
index a25b68e..ca4fcb6 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/common/GraphHolder.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/common/GraphHolder.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.common
+package foundation.e.advancedprivacy.common
 
 import android.content.Context
 import android.graphics.Canvas
@@ -43,8 +43,8 @@ import com.github.mikephil.charting.highlight.Highlight
 import com.github.mikephil.charting.listener.OnChartValueSelectedListener
 import com.github.mikephil.charting.renderer.XAxisRenderer
 import com.github.mikephil.charting.utils.MPPointF
-import foundation.e.privacycentralapp.R
-import foundation.e.privacycentralapp.common.extensions.dpToPxF
+import foundation.e.advancedprivacy.R
+import foundation.e.advancedprivacy.common.extensions.dpToPxF
 import kotlin.math.floor
 
 class GraphHolder(val barChart: BarChart, val context: Context, val isMarkerAbove: Boolean = true) {
diff --git a/app/src/main/java/foundation/e/privacycentralapp/common/NavToolbarFragment.kt b/app/src/main/java/foundation/e/advancedprivacy/common/NavToolbarFragment.kt
index 6955405..1417977 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/common/NavToolbarFragment.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/common/NavToolbarFragment.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.common
+package foundation.e.advancedprivacy.common
 
 import androidx.annotation.LayoutRes
 import com.google.android.material.appbar.MaterialToolbar
diff --git a/app/src/main/java/foundation/e/privacycentralapp/common/RightRadioButton.kt b/app/src/main/java/foundation/e/advancedprivacy/common/RightRadioButton.kt
index bbc108b..c10d755 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/common/RightRadioButton.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/common/RightRadioButton.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.common
+package foundation.e.advancedprivacy.common
 
 import android.annotation.SuppressLint
 import android.content.Context
diff --git a/app/src/main/java/foundation/e/privacycentralapp/common/TextViewHelpers.kt b/app/src/main/java/foundation/e/advancedprivacy/common/TextViewHelpers.kt
index d85f4a7..f87834a 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/common/TextViewHelpers.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/common/TextViewHelpers.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.common
+package foundation.e.advancedprivacy.common
 
 import android.content.Context
 import android.content.res.ColorStateList
@@ -27,7 +27,7 @@ import android.widget.TextView
 import androidx.annotation.StringRes
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.appcompat.widget.TooltipCompat
-import foundation.e.privacycentralapp.R
+import foundation.e.advancedprivacy.R
 
 fun setToolTipForAsterisk(
     textView: TextView,
diff --git a/app/src/main/java/foundation/e/privacycentralapp/common/ThrottleFlow.kt b/app/src/main/java/foundation/e/advancedprivacy/common/ThrottleFlow.kt
index 21e1542..e9ec060 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/common/ThrottleFlow.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/common/ThrottleFlow.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.common
+package foundation.e.advancedprivacy.common
 
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.Flow
diff --git a/app/src/main/java/foundation/e/privacycentralapp/common/ToggleAppsAdapter.kt b/app/src/main/java/foundation/e/advancedprivacy/common/ToggleAppsAdapter.kt
index c41c0cf..d8ee8ea 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/common/ToggleAppsAdapter.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/common/ToggleAppsAdapter.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.common
+package foundation.e.advancedprivacy.common
 
 import android.view.LayoutInflater
 import android.view.View
@@ -24,7 +24,7 @@ import android.widget.CheckBox
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import foundation.e.privacycentralapp.R
+import foundation.e.advancedprivacy.R
 import foundation.e.privacymodules.permissions.data.ApplicationDescription
 
 class ToggleAppsAdapter(
diff --git a/app/src/main/java/foundation/e/privacycentralapp/common/ToolbarFragment.kt b/app/src/main/java/foundation/e/advancedprivacy/common/ToolbarFragment.kt
index 5c18548..fb3ea14 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/common/ToolbarFragment.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/common/ToolbarFragment.kt
@@ -15,14 +15,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.common
+package foundation.e.advancedprivacy.common
 
 import android.os.Bundle
 import android.view.View
 import androidx.annotation.LayoutRes
 import androidx.fragment.app.Fragment
 import com.google.android.material.appbar.MaterialToolbar
-import foundation.e.privacycentralapp.R
+import foundation.e.advancedprivacy.R
 
 abstract class ToolbarFragment(@LayoutRes contentLayoutId: Int) : Fragment(contentLayoutId) {
 
diff --git a/app/src/main/java/foundation/e/privacycentralapp/common/WarningDialog.kt b/app/src/main/java/foundation/e/advancedprivacy/common/WarningDialog.kt
index cbbeffa..98deeb1 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/common/WarningDialog.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/common/WarningDialog.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.common
+package foundation.e.advancedprivacy.common
 
 import android.app.Activity
 import android.content.Context
@@ -26,14 +26,14 @@ import android.util.Log
 import android.view.View
 import android.widget.CheckBox
 import androidx.appcompat.app.AlertDialog
-import foundation.e.privacycentralapp.PrivacyCentralApplication
-import foundation.e.privacycentralapp.R
-import foundation.e.privacycentralapp.domain.entities.MainFeatures
-import foundation.e.privacycentralapp.domain.entities.MainFeatures.FAKE_LOCATION
-import foundation.e.privacycentralapp.domain.entities.MainFeatures.IP_SCRAMBLING
-import foundation.e.privacycentralapp.domain.entities.MainFeatures.TRACKERS_CONTROL
-import foundation.e.privacycentralapp.domain.usecases.ShowFeaturesWarningUseCase
-import foundation.e.privacycentralapp.main.MainActivity
+import foundation.e.advancedprivacy.AdvancedPrivacyApplication
+import foundation.e.advancedprivacy.R
+import foundation.e.advancedprivacy.domain.entities.MainFeatures
+import foundation.e.advancedprivacy.domain.entities.MainFeatures.FAKE_LOCATION
+import foundation.e.advancedprivacy.domain.entities.MainFeatures.IP_SCRAMBLING
+import foundation.e.advancedprivacy.domain.entities.MainFeatures.TRACKERS_CONTROL
+import foundation.e.advancedprivacy.domain.usecases.ShowFeaturesWarningUseCase
+import foundation.e.advancedprivacy.main.MainActivity
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
@@ -111,7 +111,7 @@ class WarningDialog : Activity() {
             }
         ) { _, _ ->
             if (checkbox.isChecked()) {
-                (application as PrivacyCentralApplication)
+                (application as AdvancedPrivacyApplication)
                     .dependencyContainer.showFeaturesWarningUseCase
                     .doNotShowAgain(feature)
             }
diff --git a/app/src/main/java/foundation/e/privacycentralapp/common/extensions/AnyExtension.kt b/app/src/main/java/foundation/e/advancedprivacy/common/extensions/AnyExtension.kt
index 71de99a..652aefd 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/common/extensions/AnyExtension.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/common/extensions/AnyExtension.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.common.extensions
+package foundation.e.advancedprivacy.common.extensions
 
 import android.content.Context
 
diff --git a/app/src/main/java/foundation/e/privacycentralapp/data/repositories/AppListsRepository.kt b/app/src/main/java/foundation/e/advancedprivacy/data/repositories/AppListsRepository.kt
index a4f7487..0b951a8 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/data/repositories/AppListsRepository.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/data/repositories/AppListsRepository.kt
@@ -15,14 +15,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.data.repositories
+package foundation.e.advancedprivacy.data.repositories
 
 import android.Manifest
 import android.content.Context
 import android.content.Intent
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageInfo
-import foundation.e.privacycentralapp.R
+import foundation.e.advancedprivacy.R
 import foundation.e.privacymodules.permissions.PermissionsPrivacyModule
 import foundation.e.privacymodules.permissions.data.ApplicationDescription
 import foundation.e.privacymodules.permissions.data.ProfileType
diff --git a/app/src/main/java/foundation/e/privacycentralapp/data/repositories/CityDataSource.kt b/app/src/main/java/foundation/e/advancedprivacy/data/repositories/CityDataSource.kt
index d6a6a19..06fb9ac 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/data/repositories/CityDataSource.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/data/repositories/CityDataSource.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.dummy
+package foundation.e.advancedprivacy.dummy
 
 object CityDataSource {
     private val BARCELONA = Pair(41.3851f, 2.1734f)
diff --git a/app/src/main/java/foundation/e/privacycentralapp/data/repositories/LocalStateRepository.kt b/app/src/main/java/foundation/e/advancedprivacy/data/repositories/LocalStateRepository.kt
index ed97c94..3f73c78 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/data/repositories/LocalStateRepository.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/data/repositories/LocalStateRepository.kt
@@ -15,11 +15,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.data.repositories
+package foundation.e.advancedprivacy.data.repositories
 
 import android.content.Context
-import foundation.e.privacycentralapp.domain.entities.InternetPrivacyMode
-import foundation.e.privacycentralapp.domain.entities.LocationMode
+import foundation.e.advancedprivacy.domain.entities.InternetPrivacyMode
+import foundation.e.advancedprivacy.domain.entities.LocationMode
 import foundation.e.privacymodules.permissions.data.ApplicationDescription
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/app/src/main/java/foundation/e/privacycentralapp/data/repositories/TrackersRepository.kt b/app/src/main/java/foundation/e/advancedprivacy/data/repositories/TrackersRepository.kt
index b5310e1..82915df 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/data/repositories/TrackersRepository.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/data/repositories/TrackersRepository.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.data.repositories
+package foundation.e.advancedprivacy.data.repositories
 
 import android.content.Context
 import android.util.Log
diff --git a/app/src/main/java/foundation/e/privacycentralapp/domain/entities/AppWithCounts.kt b/app/src/main/java/foundation/e/advancedprivacy/domain/entities/AppWithCounts.kt
index afdd2d5..4169ecc 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/domain/entities/AppWithCounts.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/domain/entities/AppWithCounts.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.domain.entities
+package foundation.e.advancedprivacy.domain.entities
 
 import android.graphics.drawable.Drawable
 import foundation.e.privacymodules.permissions.data.ApplicationDescription
diff --git a/app/src/main/java/foundation/e/privacycentralapp/domain/entities/InternetPrivacyMode.kt b/app/src/main/java/foundation/e/advancedprivacy/domain/entities/InternetPrivacyMode.kt
index f849d57..986e798 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/domain/entities/InternetPrivacyMode.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/domain/entities/InternetPrivacyMode.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.domain.entities
+package foundation.e.advancedprivacy.domain.entities
 
 enum class InternetPrivacyMode {
     REAL_IP,
diff --git a/app/src/main/java/foundation/e/privacycentralapp/domain/entities/LocationMode.kt b/app/src/main/java/foundation/e/advancedprivacy/domain/entities/LocationMode.kt
index 35a77b3..62581eb 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/domain/entities/LocationMode.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/domain/entities/LocationMode.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.domain.entities
+package foundation.e.advancedprivacy.domain.entities
 
 enum class LocationMode {
     REAL_LOCATION, RANDOM_LOCATION, SPECIFIC_LOCATION
diff --git a/app/src/main/java/foundation/e/privacycentralapp/domain/entities/MainFeatures.kt b/app/src/main/java/foundation/e/advancedprivacy/domain/entities/MainFeatures.kt
index 0e7f99c..c63d3ab 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/domain/entities/MainFeatures.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/domain/entities/MainFeatures.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.domain.entities
+package foundation.e.advancedprivacy.domain.entities
 
 enum class MainFeatures {
     TRACKERS_CONTROL, FAKE_LOCATION, IP_SCRAMBLING
diff --git a/app/src/main/java/foundation/e/privacycentralapp/domain/entities/QuickPrivacyState.kt b/app/src/main/java/foundation/e/advancedprivacy/domain/entities/QuickPrivacyState.kt
index 3257402..c21bb1d 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/domain/entities/QuickPrivacyState.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/domain/entities/QuickPrivacyState.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.domain.entities
+package foundation.e.advancedprivacy.domain.entities
 
 enum class QuickPrivacyState {
     DISABLED, ENABLED, FULL_ENABLED;
diff --git a/app/src/main/java/foundation/e/privacycentralapp/domain/entities/TrackerMode.kt b/app/src/main/java/foundation/e/advancedprivacy/domain/entities/TrackerMode.kt
index 9f057be..2033251 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/domain/entities/TrackerMode.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/domain/entities/TrackerMode.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.domain.entities
+package foundation.e.advancedprivacy.domain.entities
 
 enum class TrackerMode {
     DENIED, CUSTOM, VULNERABLE
diff --git a/app/src/main/java/foundation/e/privacycentralapp/domain/entities/TrackersPeriodicStatistics.kt b/app/src/main/java/foundation/e/advancedprivacy/domain/entities/TrackersPeriodicStatistics.kt
index 8ce55dd..c0fa637 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/domain/entities/TrackersPeriodicStatistics.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/domain/entities/TrackersPeriodicStatistics.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.domain.entities
+package foundation.e.advancedprivacy.domain.entities
 
 data class TrackersPeriodicStatistics(
     val callsBlockedNLeaked: List<Pair<Int, Int>>,
diff --git a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/AppListUseCase.kt b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/AppListUseCase.kt
index dd62839..8d38ee8 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/AppListUseCase.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/AppListUseCase.kt
@@ -15,9 +15,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.domain.usecases
+package foundation.e.advancedprivacy.domain.usecases
 
-import foundation.e.privacycentralapp.data.repositories.AppListsRepository
+import foundation.e.advancedprivacy.data.repositories.AppListsRepository
 import foundation.e.privacymodules.permissions.data.ApplicationDescription
 import kotlinx.coroutines.flow.Flow
 
diff --git a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/FakeLocationStateUseCase.kt b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/FakeLocationStateUseCase.kt
index 0ff2edb..9b99b95 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/FakeLocationStateUseCase.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/FakeLocationStateUseCase.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.domain.usecases
+package foundation.e.advancedprivacy.domain.usecases
 
 import android.app.AppOpsManager
 import android.content.Context
@@ -25,9 +25,9 @@ import android.location.LocationListener
 import android.location.LocationManager
 import android.os.Bundle
 import android.util.Log
-import foundation.e.privacycentralapp.data.repositories.LocalStateRepository
-import foundation.e.privacycentralapp.domain.entities.LocationMode
-import foundation.e.privacycentralapp.dummy.CityDataSource
+import foundation.e.advancedprivacy.data.repositories.LocalStateRepository
+import foundation.e.advancedprivacy.domain.entities.LocationMode
+import foundation.e.advancedprivacy.dummy.CityDataSource
 import foundation.e.privacymodules.fakelocation.IFakeLocationModule
 import foundation.e.privacymodules.permissions.PermissionsPrivacyModule
 import foundation.e.privacymodules.permissions.data.AppOpModes
diff --git a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/GetQuickPrivacyStateUseCase.kt b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/GetQuickPrivacyStateUseCase.kt
index e2c0e7f..475c05d 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/GetQuickPrivacyStateUseCase.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/GetQuickPrivacyStateUseCase.kt
@@ -15,13 +15,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.domain.usecases
+package foundation.e.advancedprivacy.domain.usecases
 
-import foundation.e.privacycentralapp.data.repositories.LocalStateRepository
-import foundation.e.privacycentralapp.domain.entities.InternetPrivacyMode
-import foundation.e.privacycentralapp.domain.entities.LocationMode
-import foundation.e.privacycentralapp.domain.entities.QuickPrivacyState
-import foundation.e.privacycentralapp.domain.entities.TrackerMode
+import foundation.e.advancedprivacy.data.repositories.LocalStateRepository
+import foundation.e.advancedprivacy.domain.entities.InternetPrivacyMode
+import foundation.e.advancedprivacy.domain.entities.LocationMode
+import foundation.e.advancedprivacy.domain.entities.QuickPrivacyState
+import foundation.e.advancedprivacy.domain.entities.TrackerMode
 import foundation.e.privacymodules.permissions.data.ApplicationDescription
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.SharedFlow
diff --git a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/IpScramblingStateUseCase.kt b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/IpScramblingStateUseCase.kt
index dcb417b..8c94602 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/IpScramblingStateUseCase.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/IpScramblingStateUseCase.kt
@@ -15,15 +15,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.domain.usecases
-
-import foundation.e.privacycentralapp.data.repositories.AppListsRepository
-import foundation.e.privacycentralapp.data.repositories.LocalStateRepository
-import foundation.e.privacycentralapp.domain.entities.InternetPrivacyMode
-import foundation.e.privacycentralapp.domain.entities.InternetPrivacyMode.HIDE_IP
-import foundation.e.privacycentralapp.domain.entities.InternetPrivacyMode.HIDE_IP_LOADING
-import foundation.e.privacycentralapp.domain.entities.InternetPrivacyMode.REAL_IP
-import foundation.e.privacycentralapp.domain.entities.InternetPrivacyMode.REAL_IP_LOADING
+package foundation.e.advancedprivacy.domain.usecases
+
+import foundation.e.advancedprivacy.data.repositories.AppListsRepository
+import foundation.e.advancedprivacy.data.repositories.LocalStateRepository
+import foundation.e.advancedprivacy.domain.entities.InternetPrivacyMode
+import foundation.e.advancedprivacy.domain.entities.InternetPrivacyMode.HIDE_IP
+import foundation.e.advancedprivacy.domain.entities.InternetPrivacyMode.HIDE_IP_LOADING
+import foundation.e.advancedprivacy.domain.entities.InternetPrivacyMode.REAL_IP
+import foundation.e.advancedprivacy.domain.entities.InternetPrivacyMode.REAL_IP_LOADING
 import foundation.e.privacymodules.ipscramblermodule.IIpScramblerModule
 import foundation.e.privacymodules.permissions.IPermissionsPrivacyModule
 import foundation.e.privacymodules.permissions.data.ApplicationDescription
diff --git a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/ShowFeaturesWarningUseCase.kt b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/ShowFeaturesWarningUseCase.kt
index e347b34..11bce86 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/ShowFeaturesWarningUseCase.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/ShowFeaturesWarningUseCase.kt
@@ -15,10 +15,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.domain.usecases
+package foundation.e.advancedprivacy.domain.usecases
 
-import foundation.e.privacycentralapp.data.repositories.LocalStateRepository
-import foundation.e.privacycentralapp.domain.entities.MainFeatures
+import foundation.e.advancedprivacy.data.repositories.LocalStateRepository
+import foundation.e.advancedprivacy.domain.entities.MainFeatures
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.dropWhile
diff --git a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/TrackersStateUseCase.kt b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/TrackersStateUseCase.kt
index afb6d1e..882d53f 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/TrackersStateUseCase.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/TrackersStateUseCase.kt
@@ -15,11 +15,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.domain.usecases
+package foundation.e.advancedprivacy.domain.usecases
 
-import foundation.e.privacycentralapp.data.repositories.AppListsRepository
-import foundation.e.privacycentralapp.data.repositories.LocalStateRepository
-import foundation.e.privacycentralapp.data.repositories.TrackersRepository
+import foundation.e.advancedprivacy.data.repositories.AppListsRepository
+import foundation.e.advancedprivacy.data.repositories.LocalStateRepository
+import foundation.e.advancedprivacy.data.repositories.TrackersRepository
 import foundation.e.privacymodules.permissions.data.ApplicationDescription
 import foundation.e.privacymodules.trackers.api.IBlockTrackersPrivacyModule
 import foundation.e.privacymodules.trackers.api.ITrackTrackersPrivacyModule
diff --git a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/TrackersStatisticsUseCase.kt b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/TrackersStatisticsUseCase.kt
index 5ca7039..43e4496 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/TrackersStatisticsUseCase.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/TrackersStatisticsUseCase.kt
@@ -15,14 +15,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.domain.usecases
+package foundation.e.advancedprivacy.domain.usecases
 
 import android.content.res.Resources
-import foundation.e.privacycentralapp.R
-import foundation.e.privacycentralapp.common.throttleFirst
-import foundation.e.privacycentralapp.data.repositories.AppListsRepository
-import foundation.e.privacycentralapp.domain.entities.AppWithCounts
-import foundation.e.privacycentralapp.domain.entities.TrackersPeriodicStatistics
+import foundation.e.advancedprivacy.R
+import foundation.e.advancedprivacy.common.throttleFirst
+import foundation.e.advancedprivacy.data.repositories.AppListsRepository
+import foundation.e.advancedprivacy.domain.entities.AppWithCounts
+import foundation.e.advancedprivacy.domain.entities.TrackersPeriodicStatistics
 import foundation.e.privacymodules.permissions.data.ApplicationDescription
 import foundation.e.privacymodules.trackers.api.IBlockTrackersPrivacyModule
 import foundation.e.privacymodules.trackers.api.ITrackTrackersPrivacyModule
diff --git a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/UpdateWidgetUseCase.kt b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/UpdateWidgetUseCase.kt
index f70065c..94c734c 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/UpdateWidgetUseCase.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/UpdateWidgetUseCase.kt
@@ -15,9 +15,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.domain.usecases
+package foundation.e.advancedprivacy.domain.usecases
 
-import foundation.e.privacycentralapp.data.repositories.LocalStateRepository
+import foundation.e.advancedprivacy.data.repositories.LocalStateRepository
 import foundation.e.privacymodules.trackers.api.ITrackTrackersPrivacyModule
 
 class UpdateWidgetUseCase(
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt b/app/src/main/java/foundation/e/advancedprivacy/features/dashboard/DashboardFragment.kt
index 0dc24e8..b30935c 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/dashboard/DashboardFragment.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.features.dashboard
+package foundation.e.advancedprivacy.features.dashboard
 
 import android.content.Intent
 import android.os.Bundle
@@ -32,22 +32,22 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
-import foundation.e.privacycentralapp.DependencyContainer
-import foundation.e.privacycentralapp.PrivacyCentralApplication
-import foundation.e.privacycentralapp.R
-import foundation.e.privacycentralapp.common.GraphHolder
-import foundation.e.privacycentralapp.common.NavToolbarFragment
-import foundation.e.privacycentralapp.databinding.FragmentDashboardBinding
-import foundation.e.privacycentralapp.domain.entities.InternetPrivacyMode
-import foundation.e.privacycentralapp.domain.entities.LocationMode
-import foundation.e.privacycentralapp.domain.entities.QuickPrivacyState
-import foundation.e.privacycentralapp.domain.entities.TrackerMode
-import foundation.e.privacycentralapp.features.dashboard.DashboardViewModel.Action
-import foundation.e.privacycentralapp.features.dashboard.DashboardViewModel.SingleEvent
-import foundation.e.privacycentralapp.features.internetprivacy.InternetPrivacyFragment
-import foundation.e.privacycentralapp.features.location.FakeLocationFragment
-import foundation.e.privacycentralapp.features.trackers.TrackersFragment
-import foundation.e.privacycentralapp.features.trackers.apptrackers.AppTrackersFragment
+import foundation.e.advancedprivacy.AdvancedPrivacyApplication
+import foundation.e.advancedprivacy.DependencyContainer
+import foundation.e.advancedprivacy.R
+import foundation.e.advancedprivacy.common.GraphHolder
+import foundation.e.advancedprivacy.common.NavToolbarFragment
+import foundation.e.advancedprivacy.databinding.FragmentDashboardBinding
+import foundation.e.advancedprivacy.domain.entities.InternetPrivacyMode
+import foundation.e.advancedprivacy.domain.entities.LocationMode
+import foundation.e.advancedprivacy.domain.entities.QuickPrivacyState
+import foundation.e.advancedprivacy.domain.entities.TrackerMode
+import foundation.e.advancedprivacy.features.dashboard.DashboardViewModel.Action
+import foundation.e.advancedprivacy.features.dashboard.DashboardViewModel.SingleEvent
+import foundation.e.advancedprivacy.features.internetprivacy.InternetPrivacyFragment
+import foundation.e.advancedprivacy.features.location.FakeLocationFragment
+import foundation.e.advancedprivacy.features.trackers.TrackersFragment
+import foundation.e.advancedprivacy.features.trackers.apptrackers.AppTrackersFragment
 import kotlinx.coroutines.launch
 
 class DashboardFragment : NavToolbarFragment(R.layout.fragment_dashboard) {
@@ -59,7 +59,7 @@ class DashboardFragment : NavToolbarFragment(R.layout.fragment_dashboard) {
     }
 
     private val dependencyContainer: DependencyContainer by lazy {
-        (this.requireActivity().application as PrivacyCentralApplication).dependencyContainer
+        (this.requireActivity().application as AdvancedPrivacyApplication).dependencyContainer
     }
 
     private val viewModel: DashboardViewModel by viewModels {
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardState.kt b/app/src/main/java/foundation/e/advancedprivacy/features/dashboard/DashboardState.kt
index 0e3521d..8fc8767 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardState.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/dashboard/DashboardState.kt
@@ -15,12 +15,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.features.dashboard
+package foundation.e.advancedprivacy.features.dashboard
 
-import foundation.e.privacycentralapp.domain.entities.InternetPrivacyMode
-import foundation.e.privacycentralapp.domain.entities.LocationMode
-import foundation.e.privacycentralapp.domain.entities.QuickPrivacyState
-import foundation.e.privacycentralapp.domain.entities.TrackerMode
+import foundation.e.advancedprivacy.domain.entities.InternetPrivacyMode
+import foundation.e.advancedprivacy.domain.entities.LocationMode
+import foundation.e.advancedprivacy.domain.entities.QuickPrivacyState
+import foundation.e.advancedprivacy.domain.entities.TrackerMode
 
 data class DashboardState(
     val quickPrivacyState: QuickPrivacyState = QuickPrivacyState.DISABLED,
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardViewModel.kt b/app/src/main/java/foundation/e/advancedprivacy/features/dashboard/DashboardViewModel.kt
index f3a9774..d82b073 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardViewModel.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/dashboard/DashboardViewModel.kt
@@ -16,14 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.features.dashboard
+package foundation.e.advancedprivacy.features.dashboard
 
 import androidx.annotation.StringRes
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import foundation.e.privacycentralapp.R
-import foundation.e.privacycentralapp.domain.usecases.GetQuickPrivacyStateUseCase
-import foundation.e.privacycentralapp.domain.usecases.TrackersStatisticsUseCase
+import foundation.e.advancedprivacy.R
+import foundation.e.advancedprivacy.domain.usecases.GetQuickPrivacyStateUseCase
+import foundation.e.advancedprivacy.domain.usecases.TrackersStatisticsUseCase
 import foundation.e.privacymodules.permissions.data.ApplicationDescription
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/internetprivacy/InternetPrivacyFragment.kt b/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyFragment.kt
index afef986..07da82a 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/internetprivacy/InternetPrivacyFragment.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyFragment.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.features.internetprivacy
+package foundation.e.advancedprivacy.features.internetprivacy
 
 import android.os.Bundle
 import android.view.View
@@ -27,21 +27,21 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
-import foundation.e.privacycentralapp.DependencyContainer
-import foundation.e.privacycentralapp.PrivacyCentralApplication
-import foundation.e.privacycentralapp.R
-import foundation.e.privacycentralapp.common.NavToolbarFragment
-import foundation.e.privacycentralapp.common.ToggleAppsAdapter
-import foundation.e.privacycentralapp.common.setToolTipForAsterisk
-import foundation.e.privacycentralapp.databinding.FragmentInternetActivityPolicyBinding
-import foundation.e.privacycentralapp.domain.entities.InternetPrivacyMode
+import foundation.e.advancedprivacy.AdvancedPrivacyApplication
+import foundation.e.advancedprivacy.DependencyContainer
+import foundation.e.advancedprivacy.R
+import foundation.e.advancedprivacy.common.NavToolbarFragment
+import foundation.e.advancedprivacy.common.ToggleAppsAdapter
+import foundation.e.advancedprivacy.common.setToolTipForAsterisk
+import foundation.e.advancedprivacy.databinding.FragmentInternetActivityPolicyBinding
+import foundation.e.advancedprivacy.domain.entities.InternetPrivacyMode
 import kotlinx.coroutines.launch
 import java.util.Locale
 
 class InternetPrivacyFragment : NavToolbarFragment(R.layout.fragment_internet_activity_policy) {
 
     private val dependencyContainer: DependencyContainer by lazy {
-        (this.requireActivity().application as PrivacyCentralApplication).dependencyContainer
+        (this.requireActivity().application as AdvancedPrivacyApplication).dependencyContainer
     }
 
     private val viewModel: InternetPrivacyViewModel by viewModels {
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/internetprivacy/InternetPrivacyState.kt b/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyState.kt
index 54b7e01..e0df73b 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/internetprivacy/InternetPrivacyState.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyState.kt
@@ -15,9 +15,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.features.internetprivacy
+package foundation.e.advancedprivacy.features.internetprivacy
 
-import foundation.e.privacycentralapp.domain.entities.InternetPrivacyMode
+import foundation.e.advancedprivacy.domain.entities.InternetPrivacyMode
 import foundation.e.privacymodules.permissions.data.ApplicationDescription
 
 data class InternetPrivacyState(
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/internetprivacy/InternetPrivacyViewModel.kt b/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyViewModel.kt
index bbd6239..051c8e8 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/internetprivacy/InternetPrivacyViewModel.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/internetprivacy/InternetPrivacyViewModel.kt
@@ -15,16 +15,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.features.internetprivacy
+package foundation.e.advancedprivacy.features.internetprivacy
 
 import androidx.annotation.StringRes
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import foundation.e.privacycentralapp.R
-import foundation.e.privacycentralapp.domain.entities.InternetPrivacyMode
-import foundation.e.privacycentralapp.domain.usecases.AppListUseCase
-import foundation.e.privacycentralapp.domain.usecases.GetQuickPrivacyStateUseCase
-import foundation.e.privacycentralapp.domain.usecases.IpScramblingStateUseCase
+import foundation.e.advancedprivacy.R
+import foundation.e.advancedprivacy.domain.entities.InternetPrivacyMode
+import foundation.e.advancedprivacy.domain.usecases.AppListUseCase
+import foundation.e.advancedprivacy.domain.usecases.GetQuickPrivacyStateUseCase
+import foundation.e.advancedprivacy.domain.usecases.IpScramblingStateUseCase
 import foundation.e.privacymodules.ipscramblermodule.IIpScramblerModule
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.FlowPreview
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/location/FakeLocationFragment.kt b/app/src/main/java/foundation/e/advancedprivacy/features/location/FakeLocationFragment.kt
index 9e3f854..089151e 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/location/FakeLocationFragment.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/location/FakeLocationFragment.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.features.location
+package foundation.e.advancedprivacy.features.location
 
 import android.Manifest
 import android.annotation.SuppressLint
@@ -47,13 +47,13 @@ import com.mapbox.mapboxsdk.location.modes.CameraMode
 import com.mapbox.mapboxsdk.location.modes.RenderMode
 import com.mapbox.mapboxsdk.maps.MapboxMap
 import com.mapbox.mapboxsdk.maps.Style
-import foundation.e.privacycentralapp.DependencyContainer
-import foundation.e.privacycentralapp.PrivacyCentralApplication
-import foundation.e.privacycentralapp.R
-import foundation.e.privacycentralapp.common.NavToolbarFragment
-import foundation.e.privacycentralapp.databinding.FragmentFakeLocationBinding
-import foundation.e.privacycentralapp.domain.entities.LocationMode
-import foundation.e.privacycentralapp.features.location.FakeLocationViewModel.Action
+import foundation.e.advancedprivacy.AdvancedPrivacyApplication
+import foundation.e.advancedprivacy.DependencyContainer
+import foundation.e.advancedprivacy.R
+import foundation.e.advancedprivacy.common.NavToolbarFragment
+import foundation.e.advancedprivacy.databinding.FragmentFakeLocationBinding
+import foundation.e.advancedprivacy.domain.entities.LocationMode
+import foundation.e.advancedprivacy.features.location.FakeLocationViewModel.Action
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.ensureActive
@@ -64,7 +64,7 @@ class FakeLocationFragment : NavToolbarFragment(R.layout.fragment_fake_location)
     private var isFirstLaunch: Boolean = true
 
     private val dependencyContainer: DependencyContainer by lazy {
-        (this.requireActivity().application as PrivacyCentralApplication).dependencyContainer
+        (this.requireActivity().application as AdvancedPrivacyApplication).dependencyContainer
     }
 
     private val viewModel: FakeLocationViewModel by viewModels {
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/location/FakeLocationMapView.kt b/app/src/main/java/foundation/e/advancedprivacy/features/location/FakeLocationMapView.kt
index e71bfcc..fbb5b6c 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/location/FakeLocationMapView.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/location/FakeLocationMapView.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.features.location
+package foundation.e.advancedprivacy.features.location
 
 import android.annotation.SuppressLint
 import android.content.Context
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/location/FakeLocationState.kt b/app/src/main/java/foundation/e/advancedprivacy/features/location/FakeLocationState.kt
index 50d7a14..baa672b 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/location/FakeLocationState.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/location/FakeLocationState.kt
@@ -15,10 +15,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.features.location
+package foundation.e.advancedprivacy.features.location
 
 import android.location.Location
-import foundation.e.privacycentralapp.domain.entities.LocationMode
+import foundation.e.advancedprivacy.domain.entities.LocationMode
 
 data class FakeLocationState(
     val mode: LocationMode = LocationMode.REAL_LOCATION,
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/location/FakeLocationViewModel.kt b/app/src/main/java/foundation/e/advancedprivacy/features/location/FakeLocationViewModel.kt
index 1cdf9f4..87b64c5 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/location/FakeLocationViewModel.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/location/FakeLocationViewModel.kt
@@ -15,14 +15,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.features.location
+package foundation.e.advancedprivacy.features.location
 
 import android.location.Location
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import foundation.e.privacycentralapp.domain.entities.LocationMode
-import foundation.e.privacycentralapp.domain.usecases.FakeLocationStateUseCase
-import foundation.e.privacycentralapp.domain.usecases.GetQuickPrivacyStateUseCase
+import foundation.e.advancedprivacy.domain.entities.LocationMode
+import foundation.e.advancedprivacy.domain.usecases.FakeLocationStateUseCase
+import foundation.e.advancedprivacy.domain.usecases.GetQuickPrivacyStateUseCase
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.MutableSharedFlow
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt b/app/src/main/java/foundation/e/advancedprivacy/features/trackers/TrackersFragment.kt
index cb32c2c..3e17334 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/trackers/TrackersFragment.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.features.trackers
+package foundation.e.advancedprivacy.features.trackers
 
 import android.content.ActivityNotFoundException
 import android.content.Intent
@@ -37,24 +37,24 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
-import foundation.e.privacycentralapp.DependencyContainer
-import foundation.e.privacycentralapp.PrivacyCentralApplication
-import foundation.e.privacycentralapp.R
-import foundation.e.privacycentralapp.common.AppsAdapter
-import foundation.e.privacycentralapp.common.GraphHolder
-import foundation.e.privacycentralapp.common.NavToolbarFragment
-import foundation.e.privacycentralapp.common.setToolTipForAsterisk
-import foundation.e.privacycentralapp.databinding.FragmentTrackersBinding
-import foundation.e.privacycentralapp.databinding.TrackersItemGraphBinding
-import foundation.e.privacycentralapp.domain.entities.TrackersPeriodicStatistics
-import foundation.e.privacycentralapp.features.trackers.apptrackers.AppTrackersFragment
+import foundation.e.advancedprivacy.AdvancedPrivacyApplication
+import foundation.e.advancedprivacy.DependencyContainer
+import foundation.e.advancedprivacy.R
+import foundation.e.advancedprivacy.common.AppsAdapter
+import foundation.e.advancedprivacy.common.GraphHolder
+import foundation.e.advancedprivacy.common.NavToolbarFragment
+import foundation.e.advancedprivacy.common.setToolTipForAsterisk
+import foundation.e.advancedprivacy.databinding.FragmentTrackersBinding
+import foundation.e.advancedprivacy.databinding.TrackersItemGraphBinding
+import foundation.e.advancedprivacy.domain.entities.TrackersPeriodicStatistics
+import foundation.e.advancedprivacy.features.trackers.apptrackers.AppTrackersFragment
 import kotlinx.coroutines.launch
 
 class TrackersFragment :
     NavToolbarFragment(R.layout.fragment_trackers) {
 
     private val dependencyContainer: DependencyContainer by lazy {
-        (this.requireActivity().application as PrivacyCentralApplication).dependencyContainer
+        (this.requireActivity().application as AdvancedPrivacyApplication).dependencyContainer
     }
 
     private val viewModel: TrackersViewModel by viewModels { dependencyContainer.viewModelsFactory }
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersState.kt b/app/src/main/java/foundation/e/advancedprivacy/features/trackers/TrackersState.kt
index a3bb80a..13719e4 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersState.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/trackers/TrackersState.kt
@@ -15,10 +15,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.features.trackers
+package foundation.e.advancedprivacy.features.trackers
 
-import foundation.e.privacycentralapp.domain.entities.AppWithCounts
-import foundation.e.privacycentralapp.domain.entities.TrackersPeriodicStatistics
+import foundation.e.advancedprivacy.domain.entities.AppWithCounts
+import foundation.e.advancedprivacy.domain.entities.TrackersPeriodicStatistics
 
 data class TrackersState(
     val dayStatistics: TrackersPeriodicStatistics? = null,
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersViewModel.kt b/app/src/main/java/foundation/e/advancedprivacy/features/trackers/TrackersViewModel.kt
index 8b5cc32..bcb4df8 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersViewModel.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/trackers/TrackersViewModel.kt
@@ -15,13 +15,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.features.trackers
+package foundation.e.advancedprivacy.features.trackers
 
 import android.net.Uri
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import foundation.e.privacycentralapp.domain.entities.AppWithCounts
-import foundation.e.privacycentralapp.domain.usecases.TrackersStatisticsUseCase
+import foundation.e.advancedprivacy.domain.entities.AppWithCounts
+import foundation.e.advancedprivacy.domain.usecases.TrackersStatisticsUseCase
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/AppTrackersFragment.kt b/app/src/main/java/foundation/e/advancedprivacy/features/trackers/apptrackers/AppTrackersFragment.kt
index 888c140..2bb53d6 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/AppTrackersFragment.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/trackers/apptrackers/AppTrackersFragment.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.features.trackers.apptrackers
+package foundation.e.advancedprivacy.features.trackers.apptrackers
 
 import android.content.ActivityNotFoundException
 import android.content.Intent
@@ -31,11 +31,11 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.snackbar.Snackbar
-import foundation.e.privacycentralapp.DependencyContainer
-import foundation.e.privacycentralapp.PrivacyCentralApplication
-import foundation.e.privacycentralapp.R
-import foundation.e.privacycentralapp.common.NavToolbarFragment
-import foundation.e.privacycentralapp.databinding.ApptrackersFragmentBinding
+import foundation.e.advancedprivacy.AdvancedPrivacyApplication
+import foundation.e.advancedprivacy.DependencyContainer
+import foundation.e.advancedprivacy.R
+import foundation.e.advancedprivacy.common.NavToolbarFragment
+import foundation.e.advancedprivacy.databinding.ApptrackersFragmentBinding
 import kotlinx.coroutines.launch
 
 class AppTrackersFragment : NavToolbarFragment(R.layout.apptrackers_fragment) {
@@ -53,7 +53,7 @@ class AppTrackersFragment : NavToolbarFragment(R.layout.apptrackers_fragment) {
     }
 
     private val dependencyContainer: DependencyContainer by lazy {
-        (this.requireActivity().application as PrivacyCentralApplication).dependencyContainer
+        (this.requireActivity().application as AdvancedPrivacyApplication).dependencyContainer
     }
 
     private val viewModel: AppTrackersViewModel by viewModels {
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/AppTrackersState.kt b/app/src/main/java/foundation/e/advancedprivacy/features/trackers/apptrackers/AppTrackersState.kt
index a190a74..2a9e6e8 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/AppTrackersState.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/trackers/apptrackers/AppTrackersState.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.features.trackers.apptrackers
+package foundation.e.advancedprivacy.features.trackers.apptrackers
 
 import foundation.e.privacymodules.permissions.data.ApplicationDescription
 import foundation.e.privacymodules.trackers.api.Tracker
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/AppTrackersViewModel.kt b/app/src/main/java/foundation/e/advancedprivacy/features/trackers/apptrackers/AppTrackersViewModel.kt
index e5a94f9..cda4b4b 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/AppTrackersViewModel.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/trackers/apptrackers/AppTrackersViewModel.kt
@@ -16,16 +16,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.features.trackers.apptrackers
+package foundation.e.advancedprivacy.features.trackers.apptrackers
 
 import android.net.Uri
 import androidx.annotation.StringRes
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import foundation.e.privacycentralapp.domain.entities.TrackerMode
-import foundation.e.privacycentralapp.domain.usecases.GetQuickPrivacyStateUseCase
-import foundation.e.privacycentralapp.domain.usecases.TrackersStateUseCase
-import foundation.e.privacycentralapp.domain.usecases.TrackersStatisticsUseCase
+import foundation.e.advancedprivacy.domain.entities.TrackerMode
+import foundation.e.advancedprivacy.domain.usecases.GetQuickPrivacyStateUseCase
+import foundation.e.advancedprivacy.domain.usecases.TrackersStateUseCase
+import foundation.e.advancedprivacy.domain.usecases.TrackersStatisticsUseCase
 import foundation.e.privacymodules.permissions.data.ApplicationDescription
 import foundation.e.privacymodules.trackers.api.Tracker
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/ToggleTrackersAdapter.kt b/app/src/main/java/foundation/e/advancedprivacy/features/trackers/apptrackers/ToggleTrackersAdapter.kt
index 197f13f..3696939 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/ToggleTrackersAdapter.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/features/trackers/apptrackers/ToggleTrackersAdapter.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.features.trackers.apptrackers
+package foundation.e.advancedprivacy.features.trackers.apptrackers
 
 import android.text.SpannableString
 import android.text.style.UnderlineSpan
@@ -26,7 +26,7 @@ import android.widget.Switch
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
-import foundation.e.privacycentralapp.R
+import foundation.e.advancedprivacy.R
 import foundation.e.privacymodules.trackers.api.Tracker
 
 class ToggleTrackersAdapter(
diff --git a/app/src/main/java/foundation/e/privacycentralapp/main/MainActivity.kt b/app/src/main/java/foundation/e/advancedprivacy/main/MainActivity.kt
index 92dc326..ec33e25 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/main/MainActivity.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/main/MainActivity.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.main
+package foundation.e.advancedprivacy.main
 
 import android.app.Activity
 import android.content.Context
@@ -24,11 +24,11 @@ import android.os.Bundle
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.add
 import androidx.fragment.app.commit
-import foundation.e.privacycentralapp.R
-import foundation.e.privacycentralapp.features.dashboard.DashboardFragment
-import foundation.e.privacycentralapp.features.internetprivacy.InternetPrivacyFragment
-import foundation.e.privacycentralapp.features.location.FakeLocationFragment
-import foundation.e.privacycentralapp.features.trackers.TrackersFragment
+import foundation.e.advancedprivacy.R
+import foundation.e.advancedprivacy.features.dashboard.DashboardFragment
+import foundation.e.advancedprivacy.features.internetprivacy.InternetPrivacyFragment
+import foundation.e.advancedprivacy.features.location.FakeLocationFragment
+import foundation.e.advancedprivacy.features.trackers.TrackersFragment
 
 open class MainActivity : FragmentActivity(R.layout.activity_main) {
     override fun onPostCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/foundation/e/privacycentralapp/widget/Widget.kt b/app/src/main/java/foundation/e/advancedprivacy/widget/Widget.kt
index 3abe21b..a4272e2 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/widget/Widget.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/widget/Widget.kt
@@ -15,16 +15,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp
+package foundation.e.advancedprivacy
 
 import android.appwidget.AppWidgetManager
 import android.appwidget.AppWidgetProvider
 import android.content.Context
 import android.os.Bundle
-import foundation.e.privacycentralapp.domain.usecases.GetQuickPrivacyStateUseCase
-import foundation.e.privacycentralapp.domain.usecases.TrackersStatisticsUseCase
-import foundation.e.privacycentralapp.widget.State
-import foundation.e.privacycentralapp.widget.render
+import foundation.e.advancedprivacy.domain.usecases.GetQuickPrivacyStateUseCase
+import foundation.e.advancedprivacy.domain.usecases.TrackersStatisticsUseCase
+import foundation.e.advancedprivacy.widget.State
+import foundation.e.advancedprivacy.widget.render
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/foundation/e/privacycentralapp/widget/WidgetCommandReceiver.kt b/app/src/main/java/foundation/e/advancedprivacy/widget/WidgetCommandReceiver.kt
index e01f47f..f68a59c 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/widget/WidgetCommandReceiver.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/widget/WidgetCommandReceiver.kt
@@ -15,16 +15,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.widget
+package foundation.e.advancedprivacy.widget
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import foundation.e.privacycentralapp.PrivacyCentralApplication
+import foundation.e.advancedprivacy.AdvancedPrivacyApplication
 
 class WidgetCommandReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context?, intent: Intent?) {
-        val getQuickPrivacyStateUseCase = (context?.applicationContext as? PrivacyCentralApplication)?.dependencyContainer?.getQuickPrivacyStateUseCase
+        val getQuickPrivacyStateUseCase = (context?.applicationContext as? AdvancedPrivacyApplication)?.dependencyContainer?.getQuickPrivacyStateUseCase
 
         when (intent?.action) {
             ACTION_TOGGLE_TRACKERS -> getQuickPrivacyStateUseCase?.toggleTrackers()
diff --git a/app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt b/app/src/main/java/foundation/e/advancedprivacy/widget/WidgetUI.kt
index fccfd48..cb7fe5c 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/widget/WidgetUI.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp.widget
+package foundation.e.advancedprivacy.widget
 
 import android.app.PendingIntent
 import android.app.PendingIntent.FLAG_IMMUTABLE
@@ -26,17 +26,17 @@ import android.content.Context
 import android.content.Intent
 import android.view.View
 import android.widget.RemoteViews
-import foundation.e.privacycentralapp.R
-import foundation.e.privacycentralapp.Widget
-import foundation.e.privacycentralapp.Widget.Companion.isDarkText
-import foundation.e.privacycentralapp.common.extensions.dpToPxF
-import foundation.e.privacycentralapp.domain.entities.InternetPrivacyMode
-import foundation.e.privacycentralapp.domain.entities.QuickPrivacyState
-import foundation.e.privacycentralapp.domain.entities.TrackerMode
-import foundation.e.privacycentralapp.main.MainActivity
-import foundation.e.privacycentralapp.widget.WidgetCommandReceiver.Companion.ACTION_TOGGLE_IPSCRAMBLING
-import foundation.e.privacycentralapp.widget.WidgetCommandReceiver.Companion.ACTION_TOGGLE_LOCATION
-import foundation.e.privacycentralapp.widget.WidgetCommandReceiver.Companion.ACTION_TOGGLE_TRACKERS
+import foundation.e.advancedprivacy.R
+import foundation.e.advancedprivacy.Widget
+import foundation.e.advancedprivacy.Widget.Companion.isDarkText
+import foundation.e.advancedprivacy.common.extensions.dpToPxF
+import foundation.e.advancedprivacy.domain.entities.InternetPrivacyMode
+import foundation.e.advancedprivacy.domain.entities.QuickPrivacyState
+import foundation.e.advancedprivacy.domain.entities.TrackerMode
+import foundation.e.advancedprivacy.main.MainActivity
+import foundation.e.advancedprivacy.widget.WidgetCommandReceiver.Companion.ACTION_TOGGLE_IPSCRAMBLING
+import foundation.e.advancedprivacy.widget.WidgetCommandReceiver.Companion.ACTION_TOGGLE_LOCATION
+import foundation.e.advancedprivacy.widget.WidgetCommandReceiver.Companion.ACTION_TOGGLE_TRACKERS
 
 data class State(
     val quickPrivacyState: QuickPrivacyState = QuickPrivacyState.DISABLED,
diff --git a/app/src/main/res/layout/fragment_fake_location.xml b/app/src/main/res/layout/fragment_fake_location.xml
index 47b86bf..0c95fc8 100644
--- a/app/src/main/res/layout/fragment_fake_location.xml
+++ b/app/src/main/res/layout/fragment_fake_location.xml
@@ -41,7 +41,7 @@
                 android:layout_marginTop="16dp"
                 >
 
-                <foundation.e.privacycentralapp.common.RightRadioButton
+                <foundation.e.advancedprivacy.common.RightRadioButton
                     android:id="@+id/radio_use_real_location"
                     android:layout_height="52dp"
                     android:layout_width="match_parent"
@@ -49,7 +49,7 @@
                     android:textSize="14sp"
                     />
 
-                <foundation.e.privacycentralapp.common.RightRadioButton
+                <foundation.e.advancedprivacy.common.RightRadioButton
                     android:id="@+id/radio_use_random_location"
                     android:layout_height="52dp"
                     android:layout_width="match_parent"
@@ -57,7 +57,7 @@
                     android:textSize="14sp"
                     />
 
-                <foundation.e.privacycentralapp.common.RightRadioButton
+                <foundation.e.advancedprivacy.common.RightRadioButton
                     android:id="@+id/radio_use_specific_location"
                     android:layout_height="52dp"
                     android:layout_width="match_parent"
@@ -72,7 +72,7 @@
                 android:layout_height="220dp"
                 android:layout_width="match_parent"
                 >
-                <foundation.e.privacycentralapp.features.location.FakeLocationMapView
+                <foundation.e.advancedprivacy.features.location.FakeLocationMapView
                     android:id="@+id/mapView"
                     android:layout_height="match_parent"
                     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/ipscrambling_item_selectmode.xml b/app/src/main/res/layout/ipscrambling_item_selectmode.xml
index a012f6d..0ce0cc4 100644
--- a/app/src/main/res/layout/ipscrambling_item_selectmode.xml
+++ b/app/src/main/res/layout/ipscrambling_item_selectmode.xml
@@ -27,7 +27,7 @@
         android:layout_width="match_parent"
         android:layout_height="88dp"
         >
-        <foundation.e.privacycentralapp.common.RightRadioButton
+        <foundation.e.advancedprivacy.common.RightRadioButton
             android:id="@+id/radiobutton"
             android:layout_height="match_parent"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 7047f3f..d60d1dc 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.PrivacyCentralApp" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+    <style name="Theme.AdvancedPrivacy" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/accent</item>
         <item name="colorAccent">@color/accent</item>
@@ -17,7 +17,7 @@
     </style>
 
 
-    <style name="Theme.InvisibleActivity" parent="Theme.PrivacyCentralApp">
+    <style name="Theme.InvisibleActivity" parent="Theme.AdvancedPrivacy">
         <item name="android:windowFrame">@null</item>
         <item name="android:windowIsFloating">true</item>
         <item name="android:windowIsTranslucent">true</item>
diff --git a/app/src/test/java/foundation/e/privacycentralapp/ExampleUnitTest.kt b/app/src/test/java/foundation/e/advancedprivacy/ExampleUnitTest.kt
index 71da175..f75ec1a 100644
--- a/app/src/test/java/foundation/e/privacycentralapp/ExampleUnitTest.kt
+++ b/app/src/test/java/foundation/e/advancedprivacy/ExampleUnitTest.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.privacycentralapp
+package foundation.e.advancedprivacy
 
 import org.junit.Assert
 import org.junit.Test
diff --git a/build.gradle b/build.gradle
index 9cade0a..a1d397c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import foundation.e.privacycentral.buildsrc.DependencyUpdates
-import foundation.e.privacycentral.buildsrc.ReleaseType
+import foundation.e.advancedprivacy.buildsrc.DependencyUpdates
+import foundation.e.advancedprivacy.buildsrc.ReleaseType
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
diff --git a/buildSrc/src/main/java/foundation/e/privacycentral/buildsrc/DependencyUpdates.kt b/buildSrc/src/main/java/foundation/e/advancedprivacy/buildsrc/DependencyUpdates.kt
index 852c55c..1f233d5 100644
--- a/buildSrc/src/main/java/foundation/e/privacycentral/buildsrc/DependencyUpdates.kt
+++ b/buildSrc/src/main/java/foundation/e/advancedprivacy/buildsrc/DependencyUpdates.kt
@@ -1,4 +1,4 @@
-package foundation.e.privacycentral.buildsrc
+package foundation.e.advancedprivacy.buildsrc
 
 enum class ReleaseType(private val level: Int) {
     SNAPSHOT(0),
diff --git a/fakelocation/fakelocationdemo/src/main/AndroidManifest.xml b/fakelocation/fakelocationdemo/src/main/AndroidManifest.xml
index 202599a..497f27b 100644
--- a/fakelocation/fakelocationdemo/src/main/AndroidManifest.xml
+++ b/fakelocation/fakelocationdemo/src/main/AndroidManifest.xml
@@ -26,7 +26,7 @@
     <application
         android:allowBackup="true"
         android:label="@string/app_name"
-        android:theme="@style/Theme.PrivacyCentralApp"
+        android:theme="@style/Theme.AdvancedPrivacy"
         >
         <activity
             android:exported="true"
diff --git a/fakelocation/fakelocationdemo/src/main/res/values/themes.xml b/fakelocation/fakelocationdemo/src/main/res/values/themes.xml
index 9ce6d28..58e96a0 100644
--- a/fakelocation/fakelocationdemo/src/main/res/values/themes.xml
+++ b/fakelocation/fakelocationdemo/src/main/res/values/themes.xml
@@ -17,7 +17,7 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.PrivacyCentralApp" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.AdvancedPrivacy" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
diff --git a/privapp-permissions-foundation.e.privacycentralapp.xml b/privapp-permissions-foundation.e.advancedprivacy.xml
index 48c934b..7edaace 100644
--- a/privapp-permissions-foundation.e.privacycentralapp.xml
+++ b/privapp-permissions-foundation.e.advancedprivacy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <permissions>
-    <privapp-permissions package="foundation.e.privacycentralapp.e">
+    <privapp-permissions package="foundation.e.advancedprivacy.e">
         <permission name="android.permission.UPDATE_APP_OPS_STATS" />
         <permission name="android.permission.WATCH_APPOPS" />
         <permission name="android.permission.GET_APP_OPS_STATS" />
diff --git a/scripts/sign_and_push.sh b/scripts/sign_and_push.sh
deleted file mode 100755
index 035a47b..0000000
--- a/scripts/sign_and_push.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-## This script is used for signing the apk with the platform keys and pushing it into System partition.
-## Used for testing purposes.
-
-## Note: It is used only to build /e/ OS variant build.
-
-./gradlew assembleEDebug
-adb root
-wait ${!}
-adb devices
-wait ${!}
-adb install -r app/build/outputs/apk/e/debug/PrivacyCentral-e-debug-1.0.0-alpha.apk
-wait ${!}
-adb remount && adb push privapp-permissions-foundation.e.privacycentralapp.xml system/etc/permissions
-wait ${!}
-adb shell am start -n "foundation.e.privacycentralapp.e/foundation.e.privacycentralapp.main.MainActivity" -a android.intent.action.MAIN -c android.intent.category.LAUNCHER
diff --git a/settings.gradle b/settings.gradle
index 79b05de..725f5c1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,5 @@
 include ':app'
-rootProject.name = "PrivacyCentralApp"
+rootProject.name = "AdvancedPrivacy"
 include ':fakelocation'
 include ':fakelocation:fakelocationdemo'
 include ':privacymodule-api'