diff --git a/build/tasks/generate_lineage_sdk_coverage.mk b/build/tasks/generate_lineage_sdk_coverage.mk
index c4f15c9..dca3df9 100644
--- a/build/tasks/generate_lineage_sdk_coverage.mk
+++ b/build/tasks/generate_lineage_sdk_coverage.mk
@@ -32,7 +32,7 @@
 
 lineage-sdk-test-coverage-report := $(coverage_out)/lineage-sdk-test-coverage.html
 
-lineage_sdk_tests_apk := $(call intermediates-dir-for,APPS,CMPlatformTests)/package.apk
+lineage_sdk_tests_apk := $(call intermediates-dir-for,APPS,LineagePlatformTests)/package.apk
 lineagesettingsprovider_tests_apk := $(call intermediates-dir-for,APPS,LineageSettingsProviderTests)/package.apk
 lineage_sdk_api_coverage_dependencies := $(lineage_sdk_api_coverage_exe) $(dexdeps_exe) $(api_xml_description)
 
diff --git a/build/tools/droiddoc/templates-lineage-sdk/classes.cs b/build/tools/droiddoc/templates-lineage-sdk/classes.cs
index 476e7d2..0928d7c 100644
--- a/build/tools/droiddoc/templates-lineage-sdk/classes.cs
+++ b/build/tools/droiddoc/templates-lineage-sdk/classes.cs
@@ -20,7 +20,7 @@
 </div>
 
 <div id="jd-content">
-<p>These are the CyanogenMod Platform API classes. See all <a href="packages.html">API packages</a>.</p>
+<p>These are the LineageOS Platform API classes. See all <a href="packages.html">API packages</a>.</p>
 <div class="jd-letterlist"><?cs each:letter=docs.classes ?>
     <a href="#letter_<?cs name:letter ?>"><?cs name:letter ?></a>&nbsp;&nbsp;<?cs /each?>
 </div>
diff --git a/build/tools/droiddoc/templates-lineage-sdk/components/masthead.cs b/build/tools/droiddoc/templates-lineage-sdk/components/masthead.cs
index ac71bcf..c4a6b20 100755
--- a/build/tools/droiddoc/templates-lineage-sdk/components/masthead.cs
+++ b/build/tools/droiddoc/templates-lineage-sdk/components/masthead.cs
@@ -3,7 +3,7 @@
       <div id="headerLeft">
           <a href="<?cs var:toroot ?>reference/packages.html" tabindex="-1"><img
               src="<?cs var:toroot ?>assets/cid_smart.png" alt="CID" width="50" height="50"/>
-          <span id="masthead-title">CyanogenMod Platform SDK</span></a>
+          <span id="masthead-title">LineageOS Platform SDK</span></a>
       </div>
   </div><!-- header --><?cs 
 /def ?>
diff --git a/build/tools/droiddoc/templates-lineage-sdk/customizations.cs b/build/tools/droiddoc/templates-lineage-sdk/customizations.cs
index dd00392..e302e0c 100644
--- a/build/tools/droiddoc/templates-lineage-sdk/customizations.cs
+++ b/build/tools/droiddoc/templates-lineage-sdk/customizations.cs
@@ -338,7 +338,7 @@
             </select>
           </div>
         </div><!-- end toggle -->
-        <div id="api-nav-title">CyanogenMod APIs</div>
+        <div id="api-nav-title">LineageOS APIs</div>
         </div><!-- end nav header -->
       <script>
         var SINCE_DATA = [ <?cs 
diff --git a/config/lineage_sdk_common.mk b/config/lineage_sdk_common.mk
index 8e06d9e..21c15bd 100644
--- a/config/lineage_sdk_common.mk
+++ b/config/lineage_sdk_common.mk
@@ -8,13 +8,13 @@
     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
+# Lineage Platform Library
 PRODUCT_PACKAGES += \
     org.lineageos.platform-res \
     org.lineageos.platform \
     org.lineageos.platform.xml
 
-# CM Hardware Abstraction Framework
+# Lineage Hardware Abstraction Framework
 PRODUCT_PACKAGES += \
     org.lineageos.hardware \
     org.lineageos.hardware.xml
@@ -40,11 +40,11 @@
   LINEAGE_PLATFORM_REV := 0
 endif
 
-# CyanogenMod Platform SDK Version
+# LineageOS Platform SDK Version
 PRODUCT_PROPERTY_OVERRIDES += \
   ro.lineage.build.version.plat.sdk=$(LINEAGE_PLATFORM_SDK_VERSION)
 
-# CyanogenMod Platform Internal
+# LineageOS Platform Internal
 PRODUCT_PROPERTY_OVERRIDES += \
   ro.lineage.build.version.plat.rev=$(LINEAGE_PLATFORM_REV)
 
diff --git a/overlay/common/frameworks/base/packages/Keyguard/res/values/config.xml b/overlay/common/frameworks/base/packages/Keyguard/res/values/config.xml
index 285767a..1e69bda 100644
--- a/overlay/common/frameworks/base/packages/Keyguard/res/values/config.xml
+++ b/overlay/common/frameworks/base/packages/Keyguard/res/values/config.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- default to disabling the menu key. The CM setting to
+    <!-- default to disabling the menu key. The Lineage setting to
          do this is a no-op unless the below item is true -->
     <bool name="config_disableMenuKeyInLockScreen">true</bool>