diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 16931481..b083017a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,7 +17,7 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
-          package="com.cyanogenmod.setupwizard"
+          package="org.lineageos.setupwizard"
           android:versionCode="5"
           android:sharedUserId="android.uid.system">
 
@@ -41,16 +41,16 @@
     <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
     <uses-permission android:name="lineageos.permission.HARDWARE_ABSTRACTION_ACCESS" />
     <uses-permission android:name="android.permission.BACKUP" />
-    <uses-permission android:name="cyanogenmod.permission.FINISH_SETUP" />
+    <uses-permission android:name="lineageos.permission.FINISH_SETUP" />
     <uses-permission android:name="lineageos.permission.WRITE_SETTINGS" />
     <uses-permission android:name="lineageos.permission.WRITE_SECURE_SETTINGS" />
 
     <permission
-        android:name="cyanogenmod.permission.FINISH_SETUP"
+        android:name="lineageos.permission.FINISH_SETUP"
         android:protectionLevel="signatureOrSystem" />
 
-    <protected-broadcast android:name="com.cyanogenmod.setupwizard.SETUP_FINISHED"
-                         android:permission="cyanogenmod.permission.FINISH_SETUP"/>
+    <protected-broadcast android:name="org.lineageos.setupwizard.SETUP_FINISHED"
+                         android:permission="lineageos.permission.FINISH_SETUP"/>
 
     <application android:label="@string/app_name"
                  android:icon="@mipmap/ic_launcher"
@@ -99,7 +99,7 @@
                   android:immersive="true"
                   android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
-                <action android:name="com.cyanogenmod.setupwizard.LINEAGE_BLUETOOTH_SETUP" />
+                <action android:name="org.lineageos.setupwizard.LINEAGE_BLUETOOTH_SETUP" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -111,7 +111,7 @@
                   android:immersive="true"
                   android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
-                <action android:name="com.cyanogenmod.setupwizard.LINEAGE_WELCOME" />
+                <action android:name="org.lineageos.setupwizard.LINEAGE_WELCOME" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -123,7 +123,7 @@
                   android:immersive="true"
                   android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
-                <action android:name="com.cyanogenmod.setupwizard.LINEAGE_LOCALE" />
+                <action android:name="org.lineageos.setupwizard.LINEAGE_LOCALE" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -135,7 +135,7 @@
                   android:immersive="true"
                   android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
-                <action android:name="com.cyanogenmod.setupwizard.LINEAGE_DATETIME" />
+                <action android:name="org.lineageos.setupwizard.LINEAGE_DATETIME" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -148,7 +148,7 @@
                   android:exported="false"
                   android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
-                <action android:name="com.cyanogenmod.setupwizard.LINEAGE_WIFI_SETUP" />
+                <action android:name="org.lineageos.setupwizard.LINEAGE_WIFI_SETUP" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -161,7 +161,7 @@
                   android:exported="false"
                   android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
-                <action android:name="com.cyanogenmod.setupwizard.LINEAGE_CAPTIVE_PORTAL_SETUP" />
+                <action android:name="org.lineageos.setupwizard.LINEAGE_CAPTIVE_PORTAL_SETUP" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -174,7 +174,7 @@
                   android:exported="false"
                   android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
-                <action android:name="com.cyanogenmod.setupwizard.LINEAGE_SIM_MISSING" />
+                <action android:name="org.lineageos.setupwizard.LINEAGE_SIM_MISSING" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -187,7 +187,7 @@
                   android:exported="false"
                   android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
-                <action android:name="com.cyanogenmod.setupwizard.LINEAGE_CHOOSE_DATA_SIM" />
+                <action android:name="org.lineageos.setupwizard.LINEAGE_CHOOSE_DATA_SIM" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -200,7 +200,7 @@
                   android:exported="false"
                   android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
-                <action android:name="com.cyanogenmod.setupwizard.LINEAGE_ENABLE_MOBILE_DATA" />
+                <action android:name="org.lineageos.setupwizard.LINEAGE_ENABLE_MOBILE_DATA" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -213,7 +213,7 @@
                   android:exported="false"
                   android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
-                <action android:name="com.cyanogenmod.setupwizard.LINEAGE_LOCATION_SETTINGS" />
+                <action android:name="org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -225,7 +225,7 @@
                   android:immersive="true"
                   android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
-                <action android:name="com.cyanogenmod.setupwizard.LINEAGE_SETTINGS" />
+                <action android:name="org.lineageos.setupwizard.LINEAGE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -238,7 +238,7 @@
                   android:exported="false"
                   android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
-                <action android:name="com.cyanogenmod.setupwizard.LINEAGE_FINGERPRINT_SETTINGS" />
+                <action android:name="org.lineageos.setupwizard.LINEAGE_FINGERPRINT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -251,7 +251,7 @@
                   android:exported="false"
                   android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
-                <action android:name="com.cyanogenmod.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS" />
+                <action android:name="org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -263,7 +263,7 @@
                   android:immersive="true"
                   android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
-                <action android:name="com.cyanogenmod.setupwizard.LINEAGE_SETUP_COMPLETE" />
+                <action android:name="org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -275,7 +275,7 @@
                   android:label="@@string/activity_label_empty"
                   android:theme="@style/NoDisplay">
             <intent-filter>
-                <action android:name="com.cyanogenmod.setupwizard.EXIT"/>
+                <action android:name="org.lineageos.setupwizard.EXIT"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
diff --git a/exit_wizard.sh b/exit_wizard.sh
index da9b0866..302a1526 100755
--- a/exit_wizard.sh
+++ b/exit_wizard.sh
@@ -2,12 +2,12 @@
 
 adb root
 wait ${!}
-adb shell pm enable com.cyanogenmod.setupwizard/com.cyanogenmod.setupwizard.SetupWizardExitActivity || true
+adb shell pm enable org.lineageos.setupwizard/org.lineageos.setupwizard.SetupWizardExitActivity || true
 wait ${!}
 adb shell pm enable com.google.android.setupwizard/com.google.android.setupwizard.SetupWizardExitActivity || true
 wait ${!}
 sleep 1
-adb shell am start com.cyanogenmod.setupwizard/com.cyanogenmod.setupwizard.SetupWizardExitActivity || true
+adb shell am start org.lineageos.setupwizard/org.lineageos.setupwizard.SetupWizardExitActivity || true
 wait ${!}
 sleep 1
 adb shell am start com.google.android.setupwizard/com.google.android.setupwizard.SetupWizardExitActivity
diff --git a/res/layout/finish_activity.xml b/res/layout/finish_activity.xml
index 75472dae..e4fce925 100644
--- a/res/layout/finish_activity.xml
+++ b/res/layout/finish_activity.xml
@@ -15,7 +15,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.cyanogenmod.setupwizard.widget.ScrimInsetsFrameLayout
+<org.lineageos.setupwizard.widget.ScrimInsetsFrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/root"
@@ -56,4 +56,4 @@
                android:background="@drawable/reveal"
                android:visibility="invisible"/>
 
-</com.cyanogenmod.setupwizard.widget.ScrimInsetsFrameLayout>
\ No newline at end of file
+</org.lineageos.setupwizard.widget.ScrimInsetsFrameLayout>
\ No newline at end of file
diff --git a/res/layout/locale_picker.xml b/res/layout/locale_picker.xml
index 5a02210f..2861196b 100644
--- a/res/layout/locale_picker.xml
+++ b/res/layout/locale_picker.xml
@@ -25,7 +25,7 @@
                  android:paddingTop="22dip"
                  android:paddingBottom="22dip"/>
 
-    <view class="com.cyanogenmod.setupwizard.widget.LocalePicker$CustomEditText"
+    <view class="org.lineageos.setupwizard.widget.LocalePicker$CustomEditText"
           android:textAppearance="?android:attr/textAppearanceMedium"
           android:textColor="?android:attr/textColorPrimary"
           android:id="@+id/localepicker_input"
diff --git a/res/layout/setup_locale.xml b/res/layout/setup_locale.xml
index f70d31b4..7cb83c5e 100644
--- a/res/layout/setup_locale.xml
+++ b/res/layout/setup_locale.xml
@@ -31,7 +31,7 @@
                     android:paddingLeft="@dimen/content_margin_left"
                     android:paddingRight="@dimen/content_margin_left">
 
-        <com.cyanogenmod.setupwizard.widget.LocalePicker
+        <org.lineageos.setupwizard.widget.LocalePicker
             android:id="@+id/locale_list"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/res/raw/lineage_wizard_script.xml b/res/raw/lineage_wizard_script.xml
index 486443ed..d9979940 100644
--- a/res/raw/lineage_wizard_script.xml
+++ b/res/raw/lineage_wizard_script.xml
@@ -20,58 +20,58 @@
 <WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
     wizard:firstAction="bluetooth_setup">
 
-    <WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.LINEAGE_BLUETOOTH_SETUP;end" id="bluetooth_setup">
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BLUETOOTH_SETUP;end" id="bluetooth_setup">
         <result wizard:action="welcome" />
     </WizardAction>
 
-    <WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.LINEAGE_WELCOME;end" id="welcome">
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end" id="welcome">
         <result wizard:action="locale" />
     </WizardAction>
-    <WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.LINEAGE_LOCALE;end" id="locale">
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCALE;end" id="locale">
         <result wizard:action="datetime" />
     </WizardAction>
 
-    <WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.LINEAGE_DATETIME;end" id="datetime">
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_DATETIME;end" id="datetime">
         <result wizard:action="wifi_setup" />
     </WizardAction>
 
-    <WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.LINEAGE_WIFI_SETUP;end" id="wifi_setup">
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WIFI_SETUP;end" id="wifi_setup">
         <result wizard:resultCode="1" wizard:action="sim_missing" wizard:name="no_sim" />
         <result wizard:action="choose_data_sim" />
     </WizardAction>
 
-    <WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.LINEAGE_SIM_MISSING;end" id="sim_missing">
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SIM_MISSING;end" id="sim_missing">
         <result wizard:resultCode="1" wizard:action="location_settings" wizard:name="skip_sim" />
         <result wizard:action="choose_data_sim" />
     </WizardAction>
 
-    <WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.LINEAGE_CHOOSE_DATA_SIM;end" id="choose_data_sim">
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_CHOOSE_DATA_SIM;end" id="choose_data_sim">
         <result wizard:action="enable_mobile_data" />
     </WizardAction>
 
-    <WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.LINEAGE_ENABLE_MOBILE_DATA;end" id="enable_mobile_data">
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_ENABLE_MOBILE_DATA;end" id="enable_mobile_data">
         <result wizard:action="location_settings" />
     </WizardAction>
 
-    <WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.LINEAGE_LOCATION_SETTINGS;end" id="location_settings">
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end" id="location_settings">
         <result wizard:action="lineage_settings" />
     </WizardAction>
 
-    <WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.LINEAGE_SETTINGS;end" id="lineage_settings">
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETTINGS;end" id="lineage_settings">
         <result wizard:action="fingerprint_settings" />
     </WizardAction>
 
-    <WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.LINEAGE_FINGERPRINT_SETTINGS;end" id="fingerprint_settings">
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_FINGERPRINT_SETTINGS;end" id="fingerprint_settings">
         <result wizard:action="lockscreen_settings" />
     </WizardAction>
 
-    <WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end" id="lockscreen_settings">
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end" id="lockscreen_settings">
         <result wizard:action="finish" />
     </WizardAction>
 
-    <WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">
         <result wizard:action="exit" />
     </WizardAction>
-    <WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.EXIT;end" id="exit" />
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.EXIT;end" id="exit" />
 
 </WizardScript>
diff --git a/res/raw/lineage_wizard_script_user.xml b/res/raw/lineage_wizard_script_user.xml
index 6a9fb191..3d7922d2 100644
--- a/res/raw/lineage_wizard_script_user.xml
+++ b/res/raw/lineage_wizard_script_user.xml
@@ -19,9 +19,9 @@
 <WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
               wizard:firstAction="finish">
 
-    <WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">
         <result wizard:action="exit" />
     </WizardAction>
-    <WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.EXIT;end" id="exit" />
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.EXIT;end" id="exit" />
 
 </WizardScript>
diff --git a/res/raw/wizard_script.xml b/res/raw/wizard_script.xml
index 61e0516d..fe13af5d 100644
--- a/res/raw/wizard_script.xml
+++ b/res/raw/wizard_script.xml
@@ -72,10 +72,10 @@
         <result wizard:action="oem_post_setup" />
     </WizardAction>
     <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_qr_provision_flow" id="qr_provision_flow" />
-    <WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.LINEAGE_SETTINGS;end" id="oem_post_setup">
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETTINGS;end" id="oem_post_setup">
         <result wizard:action="finish" />
     </WizardAction>
-    <WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">
         <result wizard:action="exit" />
     </WizardAction>
     <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.KID_POST_SETUP;end" id="kid_post_setup" />
diff --git a/res/raw/wizard_script_user.xml b/res/raw/wizard_script_user.xml
index 149c5007..54dd9679 100644
--- a/res/raw/wizard_script_user.xml
+++ b/res/raw/wizard_script_user.xml
@@ -61,7 +61,7 @@
     <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_user_no_account_flow" id="no_account_flow">
         <result wizard:action="oem_post_setup" />
     </WizardAction>
-    <WizardAction wizard:uri="intent:#Intent;action=com.cyanogenmod.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="oem_post_setup" />
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="oem_post_setup" />
     <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.KID_POST_SETUP;end" id="kid_post_setup" />
     <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.EXIT;end" id="exit" />
     <WizardAction id="END_OF_SCRIPT" />
diff --git a/res/values/config.xml b/res/values/config.xml
index a6d861b8..88114e97 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -16,11 +16,11 @@
 -->
 <resources>
     <integer name="local_picker_items">3</integer>
-    <bool name="branded_device">false</bool>
     <!-- The type of sim image to display.
          0=default sim image, 1=sim on side, 2=sim on back-->
     <integer name="sim_image_type">0</integer>
     <bool name="check_custom_theme_by_default">true</bool>
-    <string name="wizard_script_uri" translatable="false">android.resource://com.cyanogenmod.setupwizard/raw/wizard_script</string>
+    <string name="wizard_script_uri" translatable="false">android.resource://org.lineageos.setupwizard/raw/wizard_script</string>
+    <string name="wizard_script_user_uri" translatable="false">android.resource://org.lineageos.setupwizard/raw/wizard_script_user</string>
 
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fb73d72c..a1954a23 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -17,17 +17,13 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Setup Wizard</string>
-    <string name="product_name" translatable="false">cyanogenmod</string>
     <string name="os_name" translatable="false">LineageOS</string>
-    <string name="default_theme_name" translatable="false">Material</string>
 
-    <string name="cm_wizard_script_uri" translatable="false">android.resource://com.cyanogenmod.setupwizard/raw/cm_wizard_script</string>
-    <string name="cm_wizard_script_user_uri" translatable="false">android.resource://com.cyanogenmod.setupwizard/raw/cm_wizard_script_user</string>
+    <string name="lineage_wizard_script_uri" translatable="false">android.resource://org.lineageos.setupwizard/raw/lineage_wizard_script</string>
+    <string name="lineage_wizard_script_user_uri" translatable="false">android.resource://org.lineageos.setupwizard/raw/lineage_wizard_script_user</string>
 
     <!-- Partner SUW Strings -->
     <string name="theme_type" translatable="false">material_light</string>
-    <string name="wizard_script_uri" translatable="false">android.resource://com.cyanogenmod.setupwizard/raw/wizard_script</string>
-    <string name="wizard_script_user_uri" translatable="false">android.resource://com.cyanogenmod.setupwizard/raw/wizard_script_user</string>
     <string name="activity_label_empty" />
 
     <string name="next">Next</string>
@@ -81,8 +77,8 @@
     <string name="services_explanation" product="tablet">These services work for you to extend the capabilities of your tablet. Data will be used in accordance with LineageOS\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
     <string name="services_explanation" product="default">These services work for you to extend the capabilities of your phone. Data will be used in accordance with LineageOS\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
     <string name="services_privacy_policy">Privacy Policy</string>
-    <string name="services_help_improve_cm">Help improve <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
-    <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> by automatically sending diagnostic and usage data to LineageOS. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> features.</string>
+    <string name="services_help_improve_cm">Help improve <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
+    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> by automatically sending diagnostic and usage data to LineageOS. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="LineageOS">%2$s</xliff:g> features.</string>
     <string name="services_os_nav_keys_label"><b>Use on screen navigation keys</b> instead of hardware keys.</string>
     <string name="services_os_privacy_guard"><b>Enable Privacy guard</b> to make your personal data such as contacts, messages or call logs not available for newly installed apps</string>
 
diff --git a/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java b/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
index 56ee3090..8d1875de 100644
--- a/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
+++ b/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
@@ -15,21 +15,21 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard;
+package org.lineageos.setupwizard;
 
 import static com.android.setupwizardlib.util.ResultCodes.RESULT_ACTIVITY_NOT_FOUND;
 import static com.android.setupwizardlib.util.ResultCodes.RESULT_RETRY;
 import static com.android.setupwizardlib.util.ResultCodes.RESULT_SKIP;
 
-import static com.cyanogenmod.setupwizard.SetupWizardApp.ACTION_EMERGENCY_DIAL;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.ACTION_NEXT;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.EXTRA_ACTION_ID;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.EXTRA_FIRST_RUN;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.EXTRA_HAS_MULTIPLE_USERS;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.EXTRA_RESULT_CODE;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.EXTRA_SCRIPT_URI;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.EXTRA_USE_IMMERSIVE;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.LOGV;
+import static org.lineageos.setupwizard.SetupWizardApp.ACTION_EMERGENCY_DIAL;
+import static org.lineageos.setupwizard.SetupWizardApp.ACTION_NEXT;
+import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_ACTION_ID;
+import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_FIRST_RUN;
+import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_HAS_MULTIPLE_USERS;
+import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_RESULT_CODE;
+import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_SCRIPT_URI;
+import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_USE_IMMERSIVE;
+import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
 
 import android.annotation.NonNull;
 import android.annotation.Nullable;
@@ -56,7 +56,7 @@ import com.android.setupwizard.navigationbar.SetupWizardNavBar.NavigationBarList
 import com.android.setupwizardlib.util.SystemBarHelper;
 import com.android.setupwizardlib.util.WizardManagerHelper;
 
-import com.cyanogenmod.setupwizard.util.SetupWizardUtils;
+import org.lineageos.setupwizard.util.SetupWizardUtils;
 
 import java.util.List;
 
diff --git a/src/org/lineageos/setupwizard/BluetoothSetupActivity.java b/src/org/lineageos/setupwizard/BluetoothSetupActivity.java
index a8b8d88f..a7f3a4bb 100644
--- a/src/org/lineageos/setupwizard/BluetoothSetupActivity.java
+++ b/src/org/lineageos/setupwizard/BluetoothSetupActivity.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard;
+package org.lineageos.setupwizard;
 
-import static com.cyanogenmod.setupwizard.SetupWizardApp.REQUEST_CODE_SETUP_BLUETOOTH;
+import static org.lineageos.setupwizard.SetupWizardApp.REQUEST_CODE_SETUP_BLUETOOTH;
 
 import android.content.Intent;
 import android.util.Log;
 
-import com.cyanogenmod.setupwizard.util.SetupWizardUtils;
+import org.lineageos.setupwizard.util.SetupWizardUtils;
 
 public class BluetoothSetupActivity extends SubBaseActivity {
 
diff --git a/src/org/lineageos/setupwizard/CaptivePortalSetupActivity.java b/src/org/lineageos/setupwizard/CaptivePortalSetupActivity.java
index 1b7cc075..44335ff3 100644
--- a/src/org/lineageos/setupwizard/CaptivePortalSetupActivity.java
+++ b/src/org/lineageos/setupwizard/CaptivePortalSetupActivity.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard;
+package org.lineageos.setupwizard;
 
-import static com.cyanogenmod.setupwizard.SetupWizardApp.REQUEST_CODE_SETUP_CAPTIVE_PORTAL;
+import static org.lineageos.setupwizard.SetupWizardApp.REQUEST_CODE_SETUP_CAPTIVE_PORTAL;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/src/org/lineageos/setupwizard/ChooseDataSimActivity.java b/src/org/lineageos/setupwizard/ChooseDataSimActivity.java
index 725ade96..7f994fd8 100644
--- a/src/org/lineageos/setupwizard/ChooseDataSimActivity.java
+++ b/src/org/lineageos/setupwizard/ChooseDataSimActivity.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard;
+package org.lineageos.setupwizard;
 
-import static com.cyanogenmod.setupwizard.SetupWizardApp.LOGV;
+import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
 
 import android.os.Bundle;
 import android.os.Handler;
@@ -38,8 +38,8 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.cyanogenmod.setupwizard.util.PhoneMonitor;
-import com.cyanogenmod.setupwizard.util.SetupWizardUtils;
+import org.lineageos.setupwizard.util.PhoneMonitor;
+import org.lineageos.setupwizard.util.SetupWizardUtils;
 
 import java.util.List;
 
diff --git a/src/org/lineageos/setupwizard/DateTimeActivity.java b/src/org/lineageos/setupwizard/DateTimeActivity.java
index c9f65b43..c4b1c200 100644
--- a/src/org/lineageos/setupwizard/DateTimeActivity.java
+++ b/src/org/lineageos/setupwizard/DateTimeActivity.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard;
+package org.lineageos.setupwizard;
 
 import android.app.AlarmManager;
 import android.app.DatePickerDialog;
@@ -40,7 +40,7 @@ import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.TimePicker;
 
-import com.cyanogenmod.setupwizard.util.SetupWizardUtils;
+import org.lineageos.setupwizard.util.SetupWizardUtils;
 
 import org.xmlpull.v1.XmlPullParserException;
 
diff --git a/src/org/lineageos/setupwizard/FingerprintActivity.java b/src/org/lineageos/setupwizard/FingerprintActivity.java
index b7c678b5..9c314237 100644
--- a/src/org/lineageos/setupwizard/FingerprintActivity.java
+++ b/src/org/lineageos/setupwizard/FingerprintActivity.java
@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard;
+package org.lineageos.setupwizard;
 
-import static com.cyanogenmod.setupwizard.SetupWizardApp.ACTION_SETUP_FINGERPRINT;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.EXTRA_ALLOW_SKIP;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.EXTRA_AUTO_FINISH;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.EXTRA_DETAILS;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.EXTRA_FIRST_RUN;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.EXTRA_MATERIAL_LIGHT;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.EXTRA_THEME;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.EXTRA_TITLE;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.EXTRA_USE_IMMERSIVE;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.REQUEST_CODE_SETUP_FINGERPRINT;
+import static org.lineageos.setupwizard.SetupWizardApp.ACTION_SETUP_FINGERPRINT;
+import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_ALLOW_SKIP;
+import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_AUTO_FINISH;
+import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_DETAILS;
+import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_FIRST_RUN;
+import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_MATERIAL_LIGHT;
+import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_THEME;
+import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_TITLE;
+import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_USE_IMMERSIVE;
+import static org.lineageos.setupwizard.SetupWizardApp.REQUEST_CODE_SETUP_FINGERPRINT;
 
 import android.content.Intent;
 import android.view.View;
diff --git a/src/org/lineageos/setupwizard/FinishActivity.java b/src/org/lineageos/setupwizard/FinishActivity.java
index b2ae9a6a..d9c818df 100644
--- a/src/org/lineageos/setupwizard/FinishActivity.java
+++ b/src/org/lineageos/setupwizard/FinishActivity.java
@@ -15,14 +15,13 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard;
+package org.lineageos.setupwizard;
 
-import static com.cyanogenmod.setupwizard.SetupWizardApp.DISABLE_NAV_KEYS;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.KEY_APPLY_DEFAULT_THEME;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.KEY_BUTTON_BACKLIGHT;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.KEY_PRIVACY_GUARD;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.KEY_SEND_METRICS;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.LOGV;
+import static org.lineageos.setupwizard.SetupWizardApp.DISABLE_NAV_KEYS;
+import static org.lineageos.setupwizard.SetupWizardApp.KEY_BUTTON_BACKLIGHT;
+import static org.lineageos.setupwizard.SetupWizardApp.KEY_PRIVACY_GUARD;
+import static org.lineageos.setupwizard.SetupWizardApp.KEY_SEND_METRICS;
+import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
 
 import android.animation.Animator;
 import android.app.Activity;
@@ -45,7 +44,7 @@ import android.widget.ProgressBar;
 
 import com.android.setupwizardlib.util.WizardManagerHelper;
 
-import com.cyanogenmod.setupwizard.util.EnableAccessibilityController;
+import org.lineageos.setupwizard.util.EnableAccessibilityController;
 
 import lineageos.hardware.LineageHardwareManager;
 import lineageos.providers.LineageSettings;
diff --git a/src/org/lineageos/setupwizard/LineageSettingsActivity.java b/src/org/lineageos/setupwizard/LineageSettingsActivity.java
index 6ebdb77d..d5e2bfb9 100644
--- a/src/org/lineageos/setupwizard/LineageSettingsActivity.java
+++ b/src/org/lineageos/setupwizard/LineageSettingsActivity.java
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard;
+package org.lineageos.setupwizard;
 
-import static com.cyanogenmod.setupwizard.SetupWizardApp.DISABLE_NAV_KEYS;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.KEY_APPLY_DEFAULT_THEME;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.KEY_PRIVACY_GUARD;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.KEY_SEND_METRICS;
+import static org.lineageos.setupwizard.SetupWizardApp.DISABLE_NAV_KEYS;
+import static org.lineageos.setupwizard.SetupWizardApp.KEY_PRIVACY_GUARD;
+import static org.lineageos.setupwizard.SetupWizardApp.KEY_SEND_METRICS;
 
 import android.app.Activity;
 import android.content.Context;
@@ -44,7 +43,7 @@ import android.widget.TextView;
 
 import com.android.setupwizardlib.util.WizardManagerHelper;
 
-import com.cyanogenmod.setupwizard.R;
+import org.lineageos.setupwizard.R;
 
 import lineageos.hardware.LineageHardwareManager;
 import lineageos.providers.LineageSettings;
@@ -124,13 +123,13 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
 
         mMetricsRow = findViewById(R.id.metrics);
         mMetricsRow.setOnClickListener(mMetricsClickListener);
-        String metricsHelpImproveCM =
+        String metricsHelpImproveLineage =
                 getString(R.string.services_help_improve_cm, getString(R.string.os_name));
         String metricsSummary = getString(R.string.services_metrics_label,
-                metricsHelpImproveCM, getString(R.string.os_name));
+                metricsHelpImproveLineage, getString(R.string.os_name));
         final SpannableStringBuilder metricsSpan = new SpannableStringBuilder(metricsSummary);
         metricsSpan.setSpan(new android.text.style.StyleSpan(android.graphics.Typeface.BOLD),
-                0, metricsHelpImproveCM.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                0, metricsHelpImproveLineage.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
         TextView metrics = (TextView) findViewById(R.id.enable_metrics_summary);
         metrics.setText(metricsSpan);
         mMetrics = (CheckBox) findViewById(R.id.enable_metrics_checkbox);
diff --git a/src/org/lineageos/setupwizard/LocaleActivity.java b/src/org/lineageos/setupwizard/LocaleActivity.java
index b622d7ae..3a8e30f8 100644
--- a/src/org/lineageos/setupwizard/LocaleActivity.java
+++ b/src/org/lineageos/setupwizard/LocaleActivity.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard;
+package org.lineageos.setupwizard;
 
 import android.app.Activity;
 import android.content.BroadcastReceiver;
@@ -41,8 +41,8 @@ import com.android.internal.telephony.MccTable;
 import com.android.internal.telephony.TelephonyIntents;
 import com.android.setupwizardlib.util.WizardManagerHelper;
 
-import com.cyanogenmod.setupwizard.R;
-import com.cyanogenmod.setupwizard.widget.LocalePicker;
+import org.lineageos.setupwizard.R;
+import org.lineageos.setupwizard.widget.LocalePicker;
 
 import java.util.List;
 import java.util.Locale;
diff --git a/src/org/lineageos/setupwizard/LocationSettingsActivity.java b/src/org/lineageos/setupwizard/LocationSettingsActivity.java
index 039c3a00..27bc08cb 100644
--- a/src/org/lineageos/setupwizard/LocationSettingsActivity.java
+++ b/src/org/lineageos/setupwizard/LocationSettingsActivity.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard;
+package org.lineageos.setupwizard;
 
 import android.content.ContentResolver;
 import android.content.Intent;
@@ -26,7 +26,7 @@ import android.view.View;
 import android.widget.CheckBox;
 import android.widget.TextView;
 
-import com.cyanogenmod.setupwizard.util.SetupWizardUtils;
+import org.lineageos.setupwizard.util.SetupWizardUtils;
 
 public class LocationSettingsActivity extends BaseSetupWizardActivity {
 
diff --git a/src/org/lineageos/setupwizard/MobileDataActivity.java b/src/org/lineageos/setupwizard/MobileDataActivity.java
index cb7bf18c..a00bbef8 100644
--- a/src/org/lineageos/setupwizard/MobileDataActivity.java
+++ b/src/org/lineageos/setupwizard/MobileDataActivity.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard;
+package org.lineageos.setupwizard;
 
-import static com.cyanogenmod.setupwizard.SetupWizardApp.LOGV;
+import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
 
 import android.os.Bundle;
 import android.os.Handler;
@@ -35,9 +35,9 @@ import android.widget.ProgressBar;
 import android.widget.Switch;
 import android.widget.TextView;
 
-import com.cyanogenmod.setupwizard.util.NetworkMonitor;
-import com.cyanogenmod.setupwizard.util.PhoneMonitor;
-import com.cyanogenmod.setupwizard.util.SetupWizardUtils;
+import org.lineageos.setupwizard.util.NetworkMonitor;
+import org.lineageos.setupwizard.util.PhoneMonitor;
+import org.lineageos.setupwizard.util.SetupWizardUtils;
 
 public class MobileDataActivity extends BaseSetupWizardActivity {
 
diff --git a/src/org/lineageos/setupwizard/PartnerReceiver.java b/src/org/lineageos/setupwizard/PartnerReceiver.java
index 7a859617..f768a72e 100644
--- a/src/org/lineageos/setupwizard/PartnerReceiver.java
+++ b/src/org/lineageos/setupwizard/PartnerReceiver.java
@@ -1,4 +1,4 @@
-package com.cyanogenmod.setupwizard;
+package org.lineageos.setupwizard;
 
 /*
  * Copyright (C) 2016 The CyanogenMod Project
diff --git a/src/org/lineageos/setupwizard/ScreenLockActivity.java b/src/org/lineageos/setupwizard/ScreenLockActivity.java
index 7b53f7dc..675383e0 100644
--- a/src/org/lineageos/setupwizard/ScreenLockActivity.java
+++ b/src/org/lineageos/setupwizard/ScreenLockActivity.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard;
+package org.lineageos.setupwizard;
 
-import static com.cyanogenmod.setupwizard.SetupWizardApp.ACTION_SETUP_LOCKSCREEN;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.EXTRA_DETAILS;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.EXTRA_TITLE;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.REQUEST_CODE_SETUP_LOCKSCREEN;
+import static org.lineageos.setupwizard.SetupWizardApp.ACTION_SETUP_LOCKSCREEN;
+import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_DETAILS;
+import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_TITLE;
+import static org.lineageos.setupwizard.SetupWizardApp.REQUEST_CODE_SETUP_LOCKSCREEN;
 
 import android.content.Intent;
 import android.view.View;
diff --git a/src/org/lineageos/setupwizard/SetupWizardActivity.java b/src/org/lineageos/setupwizard/SetupWizardActivity.java
index 244f6662..081c4a19 100644
--- a/src/org/lineageos/setupwizard/SetupWizardActivity.java
+++ b/src/org/lineageos/setupwizard/SetupWizardActivity.java
@@ -15,21 +15,21 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard;
+package org.lineageos.setupwizard;
 
 import static android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION;
 
-import static com.cyanogenmod.setupwizard.SetupWizardApp.ACTION_LOAD;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.EXTRA_SCRIPT_URI;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.LOGV;
+import static org.lineageos.setupwizard.SetupWizardApp.ACTION_LOAD;
+import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_SCRIPT_URI;
+import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
 
 import android.annotation.Nullable;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 
-import com.cyanogenmod.setupwizard.util.SetupWizardUtils;
-import com.cyanogenmod.setupwizard.wizardmanager.WizardManager;
+import org.lineageos.setupwizard.util.SetupWizardUtils;
+import org.lineageos.setupwizard.wizardmanager.WizardManager;
 
 public class SetupWizardActivity extends BaseSetupWizardActivity {
     private static final String TAG = SetupWizardActivity.class.getSimpleName();
@@ -51,9 +51,9 @@ public class SetupWizardActivity extends BaseSetupWizardActivity {
             SetupWizardUtils.resetComponent(this, WizardManager.class);
             Intent intent = new Intent(ACTION_LOAD);
             if (isPrimaryUser()) {
-                intent.putExtra(EXTRA_SCRIPT_URI, getString(R.string.cm_wizard_script_uri));
+                intent.putExtra(EXTRA_SCRIPT_URI, getString(R.string.lineage_wizard_script_uri));
             } else {
-                intent.putExtra(EXTRA_SCRIPT_URI, getString(R.string.cm_wizard_script_user_uri));
+                intent.putExtra(EXTRA_SCRIPT_URI, getString(R.string.lineage_wizard_script_user_uri));
             }
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | FLAG_GRANT_READ_URI_PERMISSION);
             startActivity(intent);
diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java
index fa5fc6f7..62c1a208 100644
--- a/src/org/lineageos/setupwizard/SetupWizardApp.java
+++ b/src/org/lineageos/setupwizard/SetupWizardApp.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard;
+package org.lineageos.setupwizard;
 
 
 import android.app.Application;
@@ -23,10 +23,10 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
 
-import com.cyanogenmod.setupwizard.util.NetworkMonitor;
-import com.cyanogenmod.setupwizard.util.PhoneMonitor;
-import com.cyanogenmod.setupwizard.util.SetupWizardUtils;
-import com.cyanogenmod.setupwizard.wizardmanager.WizardManager;
+import org.lineageos.setupwizard.util.NetworkMonitor;
+import org.lineageos.setupwizard.util.PhoneMonitor;
+import org.lineageos.setupwizard.util.SetupWizardUtils;
+import org.lineageos.setupwizard.wizardmanager.WizardManager;
 
 public class SetupWizardApp extends Application {
 
@@ -36,7 +36,7 @@ public class SetupWizardApp extends Application {
     /* Verbose Logging */
     public static final boolean LOGV = Log.isLoggable(TAG, Log.VERBOSE);
 
-    public static final String ACTION_FINISHED = "com.cyanogenmod.setupwizard.SETUP_FINISHED";
+    public static final String ACTION_FINISHED = "org.lineageos.setupwizard.SETUP_FINISHED";
     public static final String ACTION_SETUP_WIFI = "android.net.wifi.PICK_WIFI_NETWORK";
     public static final String ACTION_SETUP_FINGERPRINT = "android.settings.FINGERPRINT_SETUP";
     public static final String ACTION_SETUP_LOCKSCREEN = "com.android.settings.SETUP_LOCK_SCREEN";
@@ -63,17 +63,9 @@ public class SetupWizardApp extends Application {
     public static final String KEY_DETECT_CAPTIVE_PORTAL = "captive_portal_detection_enabled";
     public static final String KEY_SEND_METRICS = "send_metrics";
     public static final String DISABLE_NAV_KEYS = "disable_nav_keys";
-    public static final String KEY_APPLY_DEFAULT_THEME = "apply_default_theme";
     public static final String KEY_BUTTON_BACKLIGHT = "pre_navbar_button_backlight";
     public static final String KEY_PRIVACY_GUARD = "privacy_guard_default";
 
-    private static final String[] THEME_PACKAGES = {
-            "org.cyanogenmod.theme.chooser",
-            "org.cyanogenmod.theme.chooser2",
-            "com.cyngn.theme.chooser",
-            "com.cyngn.themestore"
-    };
-
     public static final int REQUEST_CODE_SETUP_WIFI = 0;
     public static final int REQUEST_CODE_SETUP_CAPTIVE_PORTAL= 4;
     public static final int REQUEST_CODE_SETUP_BLUETOOTH= 5;
diff --git a/src/org/lineageos/setupwizard/SetupWizardExitActivity.java b/src/org/lineageos/setupwizard/SetupWizardExitActivity.java
index 321a4269..0edb9b3a 100644
--- a/src/org/lineageos/setupwizard/SetupWizardExitActivity.java
+++ b/src/org/lineageos/setupwizard/SetupWizardExitActivity.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard;
+package org.lineageos.setupwizard;
 
 import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 
-import static com.cyanogenmod.setupwizard.SetupWizardApp.LOGV;
+import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
 
 import android.annotation.Nullable;
 import android.content.Intent;
@@ -28,8 +28,8 @@ import android.util.Log;
 
 import com.android.setupwizardlib.util.SystemBarHelper;
 
-import com.cyanogenmod.setupwizard.util.PhoneMonitor;
-import com.cyanogenmod.setupwizard.util.SetupWizardUtils;
+import org.lineageos.setupwizard.util.PhoneMonitor;
+import org.lineageos.setupwizard.util.SetupWizardUtils;
 
 public class SetupWizardExitActivity extends BaseSetupWizardActivity {
 
diff --git a/src/org/lineageos/setupwizard/SetupWizardExitService.java b/src/org/lineageos/setupwizard/SetupWizardExitService.java
index c3243b91..9b9c7338 100644
--- a/src/org/lineageos/setupwizard/SetupWizardExitService.java
+++ b/src/org/lineageos/setupwizard/SetupWizardExitService.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard;
+package org.lineageos.setupwizard;
 
 
-import static com.cyanogenmod.setupwizard.SetupWizardApp.LOGV;
+import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
 
 import android.annotation.Nullable;
 import android.app.IntentService;
 import android.content.Intent;
 import android.util.Log;
 
-import com.cyanogenmod.setupwizard.util.SetupWizardUtils;
+import org.lineageos.setupwizard.util.SetupWizardUtils;
 
 public class SetupWizardExitService extends IntentService {
 
diff --git a/src/org/lineageos/setupwizard/SetupWizardTestActivity.java b/src/org/lineageos/setupwizard/SetupWizardTestActivity.java
index 5f978b77..912964b3 100644
--- a/src/org/lineageos/setupwizard/SetupWizardTestActivity.java
+++ b/src/org/lineageos/setupwizard/SetupWizardTestActivity.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard;
+package org.lineageos.setupwizard;
 
 import static android.content.pm.PackageManager.GET_ACTIVITIES;
 import static android.content.pm.PackageManager.GET_RECEIVERS;
 import static android.content.pm.PackageManager.GET_SERVICES;
 import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS;
 
-import static com.cyanogenmod.setupwizard.SetupWizardApp.LOGV;
+import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -31,7 +31,7 @@ import android.os.Bundle;
 import android.provider.Settings;
 import android.util.Log;
 
-import com.cyanogenmod.setupwizard.util.SetupWizardUtils;
+import org.lineageos.setupwizard.util.SetupWizardUtils;
 
 import java.util.List;
 
diff --git a/src/org/lineageos/setupwizard/SimMissingActivity.java b/src/org/lineageos/setupwizard/SimMissingActivity.java
index 7369f7de..60eb5b74 100644
--- a/src/org/lineageos/setupwizard/SimMissingActivity.java
+++ b/src/org/lineageos/setupwizard/SimMissingActivity.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard;
+package org.lineageos.setupwizard;
 
 import android.os.Bundle;
 import android.widget.ImageView;
 
 import com.android.setupwizardlib.util.ResultCodes;
 
-import com.cyanogenmod.setupwizard.util.PhoneMonitor;
+import org.lineageos.setupwizard.util.PhoneMonitor;
 
 public class SimMissingActivity extends BaseSetupWizardActivity {
 
diff --git a/src/org/lineageos/setupwizard/SubBaseActivity.java b/src/org/lineageos/setupwizard/SubBaseActivity.java
index ae44a698..63c2ea31 100644
--- a/src/org/lineageos/setupwizard/SubBaseActivity.java
+++ b/src/org/lineageos/setupwizard/SubBaseActivity.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard;
+package org.lineageos.setupwizard;
 
 
 import static android.content.Intent.FLAG_ACTIVITY_FORWARD_RESULT;
 
 import static com.android.setupwizardlib.util.ResultCodes.RESULT_ACTIVITY_NOT_FOUND;
 
-import static com.cyanogenmod.setupwizard.SetupWizardApp.EXTRA_ACTION_ID;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.EXTRA_SCRIPT_URI;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.LOGV;
+import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_ACTION_ID;
+import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_SCRIPT_URI;
+import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
 
 import android.annotation.NonNull;
 import android.content.ActivityNotFoundException;
diff --git a/src/org/lineageos/setupwizard/WelcomeActivity.java b/src/org/lineageos/setupwizard/WelcomeActivity.java
index 061cfbe0..3adebc64 100644
--- a/src/org/lineageos/setupwizard/WelcomeActivity.java
+++ b/src/org/lineageos/setupwizard/WelcomeActivity.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard;
+package org.lineageos.setupwizard;
 
 import android.os.Bundle;
 import android.view.MotionEvent;
 import android.view.View;
 
-import com.cyanogenmod.setupwizard.util.EnableAccessibilityController;
+import org.lineageos.setupwizard.util.EnableAccessibilityController;
 
 public class WelcomeActivity extends BaseSetupWizardActivity {
 
diff --git a/src/org/lineageos/setupwizard/WifiSetupActivity.java b/src/org/lineageos/setupwizard/WifiSetupActivity.java
index ec49dd39..950db9d0 100644
--- a/src/org/lineageos/setupwizard/WifiSetupActivity.java
+++ b/src/org/lineageos/setupwizard/WifiSetupActivity.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard;
+package org.lineageos.setupwizard;
 
-import static com.cyanogenmod.setupwizard.SetupWizardApp.ACTION_SETUP_WIFI;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.EXTRA_MATERIAL_LIGHT;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.REQUEST_CODE_SETUP_WIFI;
+import static org.lineageos.setupwizard.SetupWizardApp.ACTION_SETUP_WIFI;
+import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_MATERIAL_LIGHT;
+import static org.lineageos.setupwizard.SetupWizardApp.REQUEST_CODE_SETUP_WIFI;
 
 import android.content.Intent;
 
-import com.cyanogenmod.setupwizard.util.SetupWizardUtils;
+import org.lineageos.setupwizard.util.SetupWizardUtils;
 
 public class WifiSetupActivity extends SubBaseActivity {
 
diff --git a/src/org/lineageos/setupwizard/util/EnableAccessibilityController.java b/src/org/lineageos/setupwizard/util/EnableAccessibilityController.java
index 17eb7822..ccb6196a 100644
--- a/src/org/lineageos/setupwizard/util/EnableAccessibilityController.java
+++ b/src/org/lineageos/setupwizard/util/EnableAccessibilityController.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.cyanogenmod.setupwizard.util;
+package org.lineageos.setupwizard.util;
 
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.app.ActivityManager;
diff --git a/src/org/lineageos/setupwizard/util/NetworkMonitor.java b/src/org/lineageos/setupwizard/util/NetworkMonitor.java
index 0cc1d9e2..2f51c542 100644
--- a/src/org/lineageos/setupwizard/util/NetworkMonitor.java
+++ b/src/org/lineageos/setupwizard/util/NetworkMonitor.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard.util;
+package org.lineageos.setupwizard.util;
 
-import static com.cyanogenmod.setupwizard.SetupWizardApp.LOGV;
+import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -27,7 +27,7 @@ import android.net.NetworkInfo;
 import android.os.Handler;
 import android.util.Log;
 
-import com.cyanogenmod.setupwizard.SetupWizardApp;
+import org.lineageos.setupwizard.SetupWizardApp;
 
 public class NetworkMonitor {
 
diff --git a/src/org/lineageos/setupwizard/util/PhoneMonitor.java b/src/org/lineageos/setupwizard/util/PhoneMonitor.java
index ec8ba4c4..819c97dd 100644
--- a/src/org/lineageos/setupwizard/util/PhoneMonitor.java
+++ b/src/org/lineageos/setupwizard/util/PhoneMonitor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard.util;
+package org.lineageos.setupwizard.util;
 
 import static android.telephony.PhoneStateListener.LISTEN_DATA_CONNECTION_STATE;
 import static android.telephony.PhoneStateListener.LISTEN_NONE;
@@ -44,7 +44,7 @@ import static android.telephony.TelephonyManager.SIM_STATE_UNKNOWN;
 import static com.android.internal.telephony.PhoneConstants.LTE_ON_CDMA_TRUE;
 import static com.android.internal.telephony.PhoneConstants.LTE_ON_CDMA_UNKNOWN;
 
-import static com.cyanogenmod.setupwizard.SetupWizardApp.LOGV;
+import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
index c1269caa..519294e3 100644
--- a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
+++ b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard.util;
+package org.lineageos.setupwizard.util;
 
 import static android.app.StatusBarManager.DISABLE_NONE;
 import static android.app.StatusBarManager.DISABLE_NOTIFICATION_ALERTS;
@@ -29,8 +29,8 @@ import static android.content.pm.PackageManager.GET_ACTIVITIES;
 import static android.content.pm.PackageManager.GET_RECEIVERS;
 import static android.content.pm.PackageManager.GET_SERVICES;
 
-import static com.cyanogenmod.setupwizard.SetupWizardApp.KEY_DETECT_CAPTIVE_PORTAL;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.LOGV;
+import static org.lineageos.setupwizard.SetupWizardApp.KEY_DETECT_CAPTIVE_PORTAL;
+import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
 
 import android.app.StatusBarManager;
 import android.content.ComponentName;
@@ -54,14 +54,14 @@ import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.cyanogenmod.setupwizard.BluetoothSetupActivity;
-import com.cyanogenmod.setupwizard.ChooseDataSimActivity;
-import com.cyanogenmod.setupwizard.FingerprintActivity;
-import com.cyanogenmod.setupwizard.MobileDataActivity;
-import com.cyanogenmod.setupwizard.SetupWizardApp;
-import com.cyanogenmod.setupwizard.SimMissingActivity;
-import com.cyanogenmod.setupwizard.WifiSetupActivity;
-import com.cyanogenmod.setupwizard.wizardmanager.WizardManager;
+import org.lineageos.setupwizard.BluetoothSetupActivity;
+import org.lineageos.setupwizard.ChooseDataSimActivity;
+import org.lineageos.setupwizard.FingerprintActivity;
+import org.lineageos.setupwizard.MobileDataActivity;
+import org.lineageos.setupwizard.SetupWizardApp;
+import org.lineageos.setupwizard.SimMissingActivity;
+import org.lineageos.setupwizard.WifiSetupActivity;
+import org.lineageos.setupwizard.wizardmanager.WizardManager;
 
 import org.lineageos.internal.util.PackageManagerUtils;
 
diff --git a/src/org/lineageos/setupwizard/widget/LocalePicker.java b/src/org/lineageos/setupwizard/widget/LocalePicker.java
index d0636877..42356db5 100644
--- a/src/org/lineageos/setupwizard/widget/LocalePicker.java
+++ b/src/org/lineageos/setupwizard/widget/LocalePicker.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard.widget;
+package org.lineageos.setupwizard.widget;
 
-import com.cyanogenmod.setupwizard.R;
+import org.lineageos.setupwizard.R;
 
 import android.annotation.Widget;
 import android.content.Context;
diff --git a/src/org/lineageos/setupwizard/widget/ScrimInsetsFrameLayout.java b/src/org/lineageos/setupwizard/widget/ScrimInsetsFrameLayout.java
index 662e3a86..7c588cb3 100644
--- a/src/org/lineageos/setupwizard/widget/ScrimInsetsFrameLayout.java
+++ b/src/org/lineageos/setupwizard/widget/ScrimInsetsFrameLayout.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard.widget;
+package org.lineageos.setupwizard.widget;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -25,7 +25,7 @@ import android.support.v4.view.ViewCompat;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 
-import com.cyanogenmod.setupwizard.R;
+import org.lineageos.setupwizard.R;
 
 /**
  * A layout that draws something in the insets passed to {@link #fitSystemWindows(android.graphics.Rect)}, i.e. the area above UI chrome
diff --git a/src/org/lineageos/setupwizard/wizardmanager/WizardAction.java b/src/org/lineageos/setupwizard/wizardmanager/WizardAction.java
index 903d58f5..f719e279 100644
--- a/src/org/lineageos/setupwizard/wizardmanager/WizardAction.java
+++ b/src/org/lineageos/setupwizard/wizardmanager/WizardAction.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard.wizardmanager;
+package org.lineageos.setupwizard.wizardmanager;
 
 import static android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION;
 
-import static com.cyanogenmod.setupwizard.SetupWizardApp.LOGV;
+import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
 
 import android.content.Intent;
 import android.os.Parcel;
diff --git a/src/org/lineageos/setupwizard/wizardmanager/WizardManager.java b/src/org/lineageos/setupwizard/wizardmanager/WizardManager.java
index a3363cd9..4a257854 100644
--- a/src/org/lineageos/setupwizard/wizardmanager/WizardManager.java
+++ b/src/org/lineageos/setupwizard/wizardmanager/WizardManager.java
@@ -15,21 +15,21 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard.wizardmanager;
+package org.lineageos.setupwizard.wizardmanager;
 
 
-import static com.cyanogenmod.setupwizard.SetupWizardApp.ACTION_LOAD;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.ACTION_NEXT;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.EXTRA_ACTION_ID;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.EXTRA_FIRST_RUN;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.EXTRA_RESULT_CODE;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.EXTRA_SCRIPT_URI;
-import static com.cyanogenmod.setupwizard.SetupWizardApp.LOGV;
+import static org.lineageos.setupwizard.SetupWizardApp.ACTION_LOAD;
+import static org.lineageos.setupwizard.SetupWizardApp.ACTION_NEXT;
+import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_ACTION_ID;
+import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_FIRST_RUN;
+import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_RESULT_CODE;
+import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_SCRIPT_URI;
+import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
 
 import com.android.setupwizardlib.util.ResultCodes;
 import com.android.setupwizardlib.util.WizardManagerHelper;
 
-import com.cyanogenmod.setupwizard.util.SetupWizardUtils;
+import org.lineageos.setupwizard.util.SetupWizardUtils;
 
 import android.annotation.Nullable;
 import android.app.Activity;
diff --git a/src/org/lineageos/setupwizard/wizardmanager/WizardScript.java b/src/org/lineageos/setupwizard/wizardmanager/WizardScript.java
index 9e93618d..ed234069 100644
--- a/src/org/lineageos/setupwizard/wizardmanager/WizardScript.java
+++ b/src/org/lineageos/setupwizard/wizardmanager/WizardScript.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard.wizardmanager;
+package org.lineageos.setupwizard.wizardmanager;
 
-import static com.cyanogenmod.setupwizard.SetupWizardApp.LOGV;
+import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
 
 import com.android.internal.util.XmlUtils;
 
diff --git a/src/org/lineageos/setupwizard/wizardmanager/WizardTransitions.java b/src/org/lineageos/setupwizard/wizardmanager/WizardTransitions.java
index c7b826c5..7c142494 100644
--- a/src/org/lineageos/setupwizard/wizardmanager/WizardTransitions.java
+++ b/src/org/lineageos/setupwizard/wizardmanager/WizardTransitions.java
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard.wizardmanager;
+package org.lineageos.setupwizard.wizardmanager;
 
-import static com.cyanogenmod.setupwizard.SetupWizardApp.LOGV;
+import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.Log;
 import android.util.SparseArray;
 
-import com.cyanogenmod.setupwizard.SetupWizardApp;
+import org.lineageos.setupwizard.SetupWizardApp;
 
 public class WizardTransitions extends SparseArray<String> implements Parcelable {
 
diff --git a/start_lineage_wizard.sh b/start_lineage_wizard.sh
index 5c48992b..5ad5e793 100755
--- a/start_lineage_wizard.sh
+++ b/start_lineage_wizard.sh
@@ -6,4 +6,4 @@ adb shell pm disable com.google.android.setupwizard || true
 wait ${!}
 adb shell pm disable com.android.provision || true
 wait ${!}
-adb shell am start com.cyanogenmod.setupwizard/com.cyanogenmod.setupwizard.SetupWizardTestActivity
+adb shell am start org.lineageos.setupwizard/org.lineageos.setupwizard.SetupWizardTestActivity
diff --git a/start_lineage_wizard_with_gms.sh b/start_lineage_wizard_with_gms.sh
index b831e785..2e036257 100755
--- a/start_lineage_wizard_with_gms.sh
+++ b/start_lineage_wizard_with_gms.sh
@@ -6,7 +6,7 @@ adb shell pm enable com.google.android.setupwizard || true
 wait ${!}
 adb shell pm disable com.android.provision || true
 wait ${!}
-adb shell am start com.cyanogenmod.setupwizard/com.cyanogenmod.setupwizard.SetupWizardTestActivity
+adb shell am start org.lineageos.setupwizard/org.lineageos.setupwizard.SetupWizardTestActivity
 wait ${!}
 sleep 1
 adb shell am start com.google.android.setupwizard/com.google.android.setupwizard.SetupWizardTestActivity
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index a8ed7eca..733fa4b2 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.cyanogenmod.setupwizard.tests">
+          package="org.lineageos.setupwizard.tests">
     <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
     <uses-permission android:name="android.permission.STATUS_BAR"/>
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
@@ -34,7 +34,7 @@
 
     <application android:icon="@drawable/icon">
         <uses-library android:name="android.test.runner" />
-        <activity android:name="com.cyanogenmod.setupwizard.tests.ManualTestActivity"
+        <activity android:name="org.lineageos.setupwizard.tests.ManualTestActivity"
                   android:label="@string/app_test"
                   android:theme="@android:style/Theme.Material.NoActionBar"
                   android:launchMode="singleTask">
@@ -49,7 +49,7 @@
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />
 
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.cyanogenmod.setupwizard"
-                     android:label="Tests for CMSetupWizard."/>
+                     android:targetPackage="org.lineageos.setupwizard"
+                     android:label="Tests for LineageSetupWizard."/>
 
 </manifest>
diff --git a/tests/src/org/lineageos/setupwizard/tests/ManualTestActivity.java b/tests/src/org/lineageos/setupwizard/tests/ManualTestActivity.java
index 1618ccdd..38a91e11 100644
--- a/tests/src/org/lineageos/setupwizard/tests/ManualTestActivity.java
+++ b/tests/src/org/lineageos/setupwizard/tests/ManualTestActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.setupwizard.tests;
+package org.lineageos.setupwizard.tests;
 
 
 import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
@@ -45,7 +45,7 @@ public class ManualTestActivity extends Activity {
 
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.cmaccount_test);
+        setContentView(R.layout.setupwizard_test);
 
         findViewById(R.id.enable_setup).setOnClickListener(new View.OnClickListener() {
             @Override
@@ -73,7 +73,7 @@ public class ManualTestActivity extends Activity {
             Settings.Secure.putInt(getContentResolver(), Settings.Secure.USER_SETUP_COMPLETE, 0);
             final Intent intent = new Intent("android.intent.action.MAIN");
             intent.addCategory("android.intent.category.HOME");
-            resetComponentSets("com.cyanogenmod.setupwizard", GET_ACTIVITIES |
+            resetComponentSets("org.lineageos.setupwizard", GET_ACTIVITIES |
                     GET_RECEIVERS | GET_SERVICES | MATCH_DISABLED_COMPONENTS);
             resetComponentSets("com.google.android.setupwizard", GET_ACTIVITIES |
                     GET_RECEIVERS | GET_SERVICES | MATCH_DISABLED_COMPONENTS);
@@ -109,7 +109,7 @@ public class ManualTestActivity extends Activity {
         Settings.Secure.putInt(getContentResolver(), Settings.Secure.USER_SETUP_COMPLETE, 1);
         Intent intent = new Intent("android.intent.action.MAIN");
         intent.addCategory("android.intent.category.HOME");
-        disableComponentSets("com.cyanogenmod.setupwizard",  GET_ACTIVITIES |
+        disableComponentSets("org.lineageos.setupwizard",  GET_ACTIVITIES |
                 GET_RECEIVERS | GET_SERVICES);
         try {
             disableComponentSets("com.google.android.setupwizard",  GET_ACTIVITIES |
@@ -179,4 +179,4 @@ public class ManualTestActivity extends Activity {
         return componentNames;
     }
 
-}
\ No newline at end of file
+}