diff --git a/AdvancedDisplay/Android.mk b/AdvancedDisplay/Android.mk
index 3362e95d..d972dc4f 100644
--- a/AdvancedDisplay/Android.mk
+++ b/AdvancedDisplay/Android.mk
@@ -13,7 +13,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-v7-appcompat \
     android-support-v7-preference \
     android-support-v7-recyclerview \
-    org.cyanogenmod.platform.internal
+    org.lineageos.platform.internal
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
diff --git a/AdvancedDisplay/AndroidManifest.xml b/AdvancedDisplay/AndroidManifest.xml
index 82b1ad3e..241b1055 100644
--- a/AdvancedDisplay/AndroidManifest.xml
+++ b/AdvancedDisplay/AndroidManifest.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.cyanogenmod.settings.device"
+    package="org.lineageos.settings.device"
     android:sharedUserId="android.uid.system">
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
     <application
         android:label="@string/app_name">
-        <receiver android:name="com.cyanogenmod.settings.device.BootCompletedReceiver">
+        <receiver android:name="org.lineageos.settings.device.BootCompletedReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/AdvancedDisplay/res/xml/screen_preferences.xml b/AdvancedDisplay/res/xml/screen_preferences.xml
index 2223cdb4..492f5a4d 100644
--- a/AdvancedDisplay/res/xml/screen_preferences.xml
+++ b/AdvancedDisplay/res/xml/screen_preferences.xml
@@ -6,7 +6,7 @@
             android:title="@string/screen_colors_title">
 
         <!-- mDNIe Scenario modes -->
-        <com.cyanogenmod.settings.device.mDNIeScenario
+        <org.lineageos.settings.device.mDNIeScenario
                 android:key="mdnie_scenario"
                 android:title="@string/mdnie_scenario_title_head"
                 android:summary="@string/mdnie_scenario_summary_head"
@@ -15,7 +15,7 @@
                 android:defaultValue="0" />
 
         <!-- mDNIe Negative mode -->
-        <com.cyanogenmod.settings.device.mDNIeNegative
+        <org.lineageos.settings.device.mDNIeNegative
                 android:key="mdnie_negative"
                 android:title="@string/mdnie_negative_title_head"
                 android:summary="@string/mdnie_negative_summary_head"
diff --git a/AdvancedDisplay/src/com/cyanogenmod/settings/device/AdvancedDisplayActivity.java b/AdvancedDisplay/src/org/lineageos/settings/device/AdvancedDisplayActivity.java
similarity index 96%
rename from AdvancedDisplay/src/com/cyanogenmod/settings/device/AdvancedDisplayActivity.java
rename to AdvancedDisplay/src/org/lineageos/settings/device/AdvancedDisplayActivity.java
index 29ab9b6b..82ce158e 100644
--- a/AdvancedDisplay/src/com/cyanogenmod/settings/device/AdvancedDisplayActivity.java
+++ b/AdvancedDisplay/src/org/lineageos/settings/device/AdvancedDisplayActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.settings.device;
+package org.lineageos.settings.device;
 
 import android.os.Bundle;
 
diff --git a/AdvancedDisplay/src/com/cyanogenmod/settings/device/AdvancedDisplayFragment.java b/AdvancedDisplay/src/org/lineageos/settings/device/AdvancedDisplayFragment.java
similarity index 92%
rename from AdvancedDisplay/src/com/cyanogenmod/settings/device/AdvancedDisplayFragment.java
rename to AdvancedDisplay/src/org/lineageos/settings/device/AdvancedDisplayFragment.java
index a2b7f7b9..6d4c5345 100644
--- a/AdvancedDisplay/src/com/cyanogenmod/settings/device/AdvancedDisplayFragment.java
+++ b/AdvancedDisplay/src/org/lineageos/settings/device/AdvancedDisplayFragment.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.settings.device;
+package org.lineageos.settings.device;
 
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.support.v14.preference.PreferenceFragment;
 
-import com.cyanogenmod.settings.device.R;
+import org.lineageos.settings.device.R;
 
-import org.cyanogenmod.internal.util.FileUtils;
+import org.lineageos.internal.util.FileUtils;
 
 public class AdvancedDisplayFragment extends PreferenceFragment {
     private mDNIeScenario mmDNIeScenario;
diff --git a/AdvancedDisplay/src/com/cyanogenmod/settings/device/BootCompletedReceiver.java b/AdvancedDisplay/src/org/lineageos/settings/device/BootCompletedReceiver.java
similarity index 96%
rename from AdvancedDisplay/src/com/cyanogenmod/settings/device/BootCompletedReceiver.java
rename to AdvancedDisplay/src/org/lineageos/settings/device/BootCompletedReceiver.java
index 9408f353..36a4270a 100644
--- a/AdvancedDisplay/src/com/cyanogenmod/settings/device/BootCompletedReceiver.java
+++ b/AdvancedDisplay/src/org/lineageos/settings/device/BootCompletedReceiver.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.settings.device;
+package org.lineageos.settings.device;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/AdvancedDisplay/src/com/cyanogenmod/settings/device/Constants.java b/AdvancedDisplay/src/org/lineageos/settings/device/Constants.java
similarity index 94%
rename from AdvancedDisplay/src/com/cyanogenmod/settings/device/Constants.java
rename to AdvancedDisplay/src/org/lineageos/settings/device/Constants.java
index 5ce0473d..372cf506 100644
--- a/AdvancedDisplay/src/com/cyanogenmod/settings/device/Constants.java
+++ b/AdvancedDisplay/src/org/lineageos/settings/device/Constants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.settings.device;
+package org.lineageos.settings.device;
 
 public class Constants {
     static final String KEY_MDNIE_SCENARIO = "mdnie_scenario";
diff --git a/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeNegative.java b/AdvancedDisplay/src/org/lineageos/settings/device/mDNIeNegative.java
similarity index 95%
rename from AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeNegative.java
rename to AdvancedDisplay/src/org/lineageos/settings/device/mDNIeNegative.java
index fc24e980..25d41991 100644
--- a/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeNegative.java
+++ b/AdvancedDisplay/src/org/lineageos/settings/device/mDNIeNegative.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.settings.device;
+package org.lineageos.settings.device;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -25,7 +25,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.support.v7.preference.PreferenceManager;
 import android.util.AttributeSet;
 
-import org.cyanogenmod.internal.util.FileUtils;
+import org.lineageos.internal.util.FileUtils;
 
 public class mDNIeNegative extends ListPreference implements OnPreferenceChangeListener {
 
diff --git a/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeScenario.java b/AdvancedDisplay/src/org/lineageos/settings/device/mDNIeScenario.java
similarity index 95%
rename from AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeScenario.java
rename to AdvancedDisplay/src/org/lineageos/settings/device/mDNIeScenario.java
index bd5a6986..9261f7cc 100644
--- a/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeScenario.java
+++ b/AdvancedDisplay/src/org/lineageos/settings/device/mDNIeScenario.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.settings.device;
+package org.lineageos.settings.device;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -25,7 +25,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.support.v7.preference.PreferenceManager;
 import android.util.AttributeSet;
 
-import org.cyanogenmod.internal.util.FileUtils;
+import org.lineageos.internal.util.FileUtils;
 
 public class mDNIeScenario extends ListPreference implements OnPreferenceChangeListener {