diff --git a/config/common.mk b/config/common.mk
index a2fc614..b514c49 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -83,14 +83,14 @@
 
 # This is Lineage!
 PRODUCT_COPY_FILES += \
-    vendor/lineage/config/permissions/com.cyanogenmod.android.xml:system/etc/permissions/com.cyanogenmod.android.xml
+    vendor/lineage/config/permissions/org.lineageos.android.xml:system/etc/permissions/org.lineageos.android.xml
 
 # Include Lineage audio files
 include vendor/lineage/config/lineage_audio.mk
 
-ifneq ($(TARGET_DISABLE_CMSDK), true)
-# CMSDK
-include vendor/lineage/config/cmsdk_common.mk
+ifneq ($(TARGET_DISABLE_LINEAGE_SDK), true)
+# Lineage SDK
+include vendor/lineage/config/lineage_sdk_common.mk
 endif
 
 # TWRP
@@ -106,7 +106,7 @@
 PRODUCT_PACKAGES += \
     BluetoothExt \
     CMAudioService \
-    CMParts \
+    LineageParts \
     Development \
     Profiles \
     WeatherManagerService
@@ -126,7 +126,7 @@
 # Custom Lineage packages
 PRODUCT_PACKAGES += \
     AudioFX \
-    CMSettingsProvider \
+    LineageSettingsProvider \
     LineageSetupWizard \
     Eleven \
     ExactCalculator \
diff --git a/config/lineage_sdk_common.mk b/config/lineage_sdk_common.mk
index f1fb666..8e06d9e 100644
--- a/config/lineage_sdk_common.mk
+++ b/config/lineage_sdk_common.mk
@@ -1,50 +1,50 @@
-# Permissions for cmsdk services
+# Permissions for lineage sdk services
 PRODUCT_COPY_FILES += \
-    vendor/lineage/config/permissions/org.cyanogenmod.audio.xml:system/etc/permissions/org.cyanogenmod.audio.xml \
-    vendor/lineage/config/permissions/org.cyanogenmod.livedisplay.xml:system/etc/permissions/org.cyanogenmod.livedisplay.xml \
-    vendor/lineage/config/permissions/org.cyanogenmod.performance.xml:system/etc/permissions/org.cyanogenmod.performance.xml \
-    vendor/lineage/config/permissions/org.cyanogenmod.profiles.xml:system/etc/permissions/org.cyanogenmod.profiles.xml \
-    vendor/lineage/config/permissions/org.cyanogenmod.statusbar.xml:system/etc/permissions/org.cyanogenmod.statusbar.xml \
-    vendor/lineage/config/permissions/org.cyanogenmod.telephony.xml:system/etc/permissions/org.cyanogenmod.telephony.xml \
-    vendor/lineage/config/permissions/org.cyanogenmod.weather.xml:system/etc/permissions/org.cyanogenmod.weather.xml
+    vendor/lineage/config/permissions/org.lineageos.audio.xml:system/etc/permissions/org.lineageos.audio.xml \
+    vendor/lineage/config/permissions/org.lineageos.livedisplay.xml:system/etc/permissions/org.lineageos.livedisplay.xml \
+    vendor/lineage/config/permissions/org.lineageos.performance.xml:system/etc/permissions/org.lineageos.performance.xml \
+    vendor/lineage/config/permissions/org.lineageos.profiles.xml:system/etc/permissions/org.lineageos.profiles.xml \
+    vendor/lineage/config/permissions/org.lineageos.statusbar.xml:system/etc/permissions/org.lineageos.statusbar.xml \
+    vendor/lineage/config/permissions/org.lineageos.telephony.xml:system/etc/permissions/org.lineageos.telephony.xml \
+    vendor/lineage/config/permissions/org.lineageos.weather.xml:system/etc/permissions/org.lineageos.weather.xml
 
 # CM Platform Library
 PRODUCT_PACKAGES += \
-    org.cyanogenmod.platform-res \
-    org.cyanogenmod.platform \
-    org.cyanogenmod.platform.xml
+    org.lineageos.platform-res \
+    org.lineageos.platform \
+    org.lineageos.platform.xml
 
 # CM Hardware Abstraction Framework
 PRODUCT_PACKAGES += \
-    org.cyanogenmod.hardware \
-    org.cyanogenmod.hardware.xml
+    org.lineageos.hardware \
+    org.lineageos.hardware.xml
 
 # JNI Libraries
 PRODUCT_PACKAGES += \
-    libcmsdk_platform_jni
+    liblineage-sdk_platform_jni
 
-ifndef CM_PLATFORM_SDK_VERSION
+ifndef LINEAGE_PLATFORM_SDK_VERSION
   # This is the canonical definition of the SDK version, which defines
   # the set of APIs and functionality available in the platform.  It
   # is a single integer that increases monotonically as updates to
   # the SDK are released.  It should only be incremented when the APIs for
   # the new release are frozen (so that developers don't write apps against
   # intermediate builds).
-  CM_PLATFORM_SDK_VERSION := 7
+  LINEAGE_PLATFORM_SDK_VERSION := 7
 endif
 
-ifndef CM_PLATFORM_REV
+ifndef LINEAGE_PLATFORM_REV
   # For internal SDK revisions that are hotfixed/patched
-  # Reset after each CM_PLATFORM_SDK_VERSION release
+  # Reset after each LINEAGE_PLATFORM_SDK_VERSION release
   # If you are doing a release and this is NOT 0, you are almost certainly doing it wrong
-  CM_PLATFORM_REV := 0
+  LINEAGE_PLATFORM_REV := 0
 endif
 
 # CyanogenMod Platform SDK Version
 PRODUCT_PROPERTY_OVERRIDES += \
-  ro.cm.build.version.plat.sdk=$(CM_PLATFORM_SDK_VERSION)
+  ro.lineage.build.version.plat.sdk=$(LINEAGE_PLATFORM_SDK_VERSION)
 
 # CyanogenMod Platform Internal
 PRODUCT_PROPERTY_OVERRIDES += \
-  ro.cm.build.version.plat.rev=$(CM_PLATFORM_REV)
+  ro.lineage.build.version.plat.rev=$(LINEAGE_PLATFORM_REV)
 
diff --git a/config/permissions/org.lineageos.android.xml b/config/permissions/org.lineageos.android.xml
index f5126c4..970658d 100644
--- a/config/permissions/org.lineageos.android.xml
+++ b/config/permissions/org.lineageos.android.xml
@@ -14,8 +14,8 @@
      limitations under the License.
 -->
 
-<!-- This feature shows that this is CyanogenMod -->
+<!-- This feature shows that this is LineageOS -->
 <permissions>
-    <feature name="com.cyanogenmod.android" />
+    <feature name="org.lineageos.android" />
 </permissions>
 
diff --git a/config/permissions/org.lineageos.audio.xml b/config/permissions/org.lineageos.audio.xml
index 1a5d122..f5f5f4d 100644
--- a/config/permissions/org.lineageos.audio.xml
+++ b/config/permissions/org.lineageos.audio.xml
@@ -16,8 +16,8 @@
 
 <permissions>
     <!-- The feature listed here coincides with the PerformanceManagerService declared as
-        part of the external cm service init in SystemServer. If this xml isn't present
+        part of the external lineage service init in SystemServer. If this xml isn't present
         on the device, the service will not be published as a binder service!
     -->
-    <feature name="org.cyanogenmod.audio" />
+    <feature name="org.lineageos.audio" />
 </permissions>
diff --git a/config/permissions/org.lineageos.livedisplay.xml b/config/permissions/org.lineageos.livedisplay.xml
index bfae5d3..22adee5 100644
--- a/config/permissions/org.lineageos.livedisplay.xml
+++ b/config/permissions/org.lineageos.livedisplay.xml
@@ -16,8 +16,8 @@
 
 <permissions>
     <!-- The feature listed here coincides with the PerformanceManagerService declared as
-        part of the external cm service init in SystemServer. If this xml isn't present
+        part of the external lineage service init in SystemServer. If this xml isn't present
         on the device, the service will not be published as a binder service!
     -->
-    <feature name="org.cyanogenmod.livedisplay" />
+    <feature name="org.lineageos.livedisplay" />
 </permissions>
diff --git a/config/permissions/org.lineageos.performance.xml b/config/permissions/org.lineageos.performance.xml
index 464de6e..9468b6d 100644
--- a/config/permissions/org.lineageos.performance.xml
+++ b/config/permissions/org.lineageos.performance.xml
@@ -16,8 +16,8 @@
 
 <permissions>
     <!-- The feature listed here coincides with the PerformanceManagerService declared as
-        part of the external cm service init in SystemServer. If this xml isn't present
+        part of the external lineage service init in SystemServer. If this xml isn't present
         on the device, the service will not be published as a binder service!
     -->
-    <feature name="org.cyanogenmod.performance" />
+    <feature name="org.lineageos.performance" />
 </permissions>
diff --git a/config/permissions/org.lineageos.profiles.xml b/config/permissions/org.lineageos.profiles.xml
index 6a45526..2e55912 100644
--- a/config/permissions/org.lineageos.profiles.xml
+++ b/config/permissions/org.lineageos.profiles.xml
@@ -16,8 +16,8 @@
 
 <permissions>
     <!-- The feature listed here coincides with the ProfileManagerService declared as
-         part of the external cm service init in SystemServer. If this xml isn't present
+         part of the external lineage service init in SystemServer. If this xml isn't present
          on the device, the service will not be published as a binder service!
      -->
-    <feature name="org.cyanogenmod.profiles" />
+    <feature name="org.lineageos.profiles" />
 </permissions>
diff --git a/config/permissions/org.lineageos.statusbar.xml b/config/permissions/org.lineageos.statusbar.xml
index 562bf9e..2792db8 100644
--- a/config/permissions/org.lineageos.statusbar.xml
+++ b/config/permissions/org.lineageos.statusbar.xml
@@ -15,9 +15,9 @@
 -->
 
 <permissions>
-    <!-- The feature listed here coincides with the CMStatusBarManagerService declared as
-         part of the external cm service init in SystemServer. If this xml isn't present
+    <!-- The feature listed here coincides with the LineageStatusBarManagerService declared as
+         part of the external lineage service init in SystemServer. If this xml isn't present
          on the device, the service will not be published as a binder service!
      -->
-    <feature name="org.cyanogenmod.statusbar" />
+    <feature name="org.lineageos.statusbar" />
 </permissions>
diff --git a/config/permissions/org.lineageos.telephony.xml b/config/permissions/org.lineageos.telephony.xml
index 3e89e8a..5a741a1 100644
--- a/config/permissions/org.lineageos.telephony.xml
+++ b/config/permissions/org.lineageos.telephony.xml
@@ -15,9 +15,9 @@
 -->
 
 <permissions>
-    <!-- The feature listed here coincides with the CMTelephonyManagerService declared as
-         part of the external cm service init in SystemServer. If this xml isn't present
+    <!-- The feature listed here coincides with the LineageTelephonyManagerService declared as
+         part of the external lineage service init in SystemServer. If this xml isn't present
          on the device, the service will not be published as a binder service!
      -->
-    <feature name="org.cyanogenmod.telephony" />
+    <feature name="org.lineageos.telephony" />
 </permissions>
diff --git a/config/permissions/org.lineageos.weather.xml b/config/permissions/org.lineageos.weather.xml
index 69cd0b7..d8d012a 100644
--- a/config/permissions/org.lineageos.weather.xml
+++ b/config/permissions/org.lineageos.weather.xml
@@ -15,5 +15,5 @@
 -->
 
 <permissions>
-    <feature name="org.cyanogenmod.weather" />
+    <feature name="org.lineageos.weather" />
 </permissions>