diff --git a/.github/workflows/build-yocto.yml b/.github/workflows/build-yocto.yml
index a6a34aa1c..61aed0f60 100644
--- a/.github/workflows/build-yocto.yml
+++ b/.github/workflows/build-yocto.yml
@@ -110,7 +110,7 @@ jobs:
           - iq-8275-evk
           - iq-9075-evk
           - qcm6490-idp
-          - qcs615-adp-air
+          - qcs615-ride
           - qcs8300-ride-sx
           - qcs9100-ride-sx
           - qrb2210-rb1-core-kit
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index be7d803ec..34f52b921 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ jobs:
           - iq-8275-evk
           - iq-9075-evk
           - qcm6490-idp
-          - qcs615-adp-air
+          - qcs615-ride
           - qcs6490-rb3gen2-core-kit
           - qcs8300-ride-sx
           - qcs9100-ride-sx
diff --git a/ci/qcs615-adp-air.yml b/ci/qcs615-ride.yml
similarity index 86%
rename from ci/qcs615-adp-air.yml
rename to ci/qcs615-ride.yml
index ace376bff..d09d46d30 100644
--- a/ci/qcs615-adp-air.yml
+++ b/ci/qcs615-ride.yml
@@ -5,4 +5,4 @@ header:
   includes:
   - ci/base.yml
 
-machine: qcs615-adp-air
+machine: qcs615-ride
diff --git a/conf/machine/qcs615-adp-air.conf b/conf/machine/qcs615-ride.conf
similarity index 75%
rename from conf/machine/qcs615-adp-air.conf
rename to conf/machine/qcs615-ride.conf
index c7c06da1f..1ab09a8f4 100644
--- a/conf/machine/qcs615-adp-air.conf
+++ b/conf/machine/qcs615-ride.conf
@@ -13,10 +13,10 @@ KERNEL_DEVICETREE ?= " \
                       "
 
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
-    packagegroup-qcs615-adp-air-firmware \
-    packagegroup-qcs615-adp-air-hexagon-dsp-binaries \
+    packagegroup-qcs615-ride-firmware \
+    packagegroup-qcs615-ride-hexagon-dsp-binaries \
 "
 
 QCOM_CDT_FILE = "cdt_adp_air_sa6155p"
 QCOM_BOOT_FILES_SUBDIR = "qcs615"
-QCOM_PARTITION_FILES_SUBDIR ?= "partitions/qcs615-adp-air/ufs"
+QCOM_PARTITION_FILES_SUBDIR ?= "partitions/qcs615-ride/ufs"
diff --git a/recipes-bsp/images/initramfs-firmware-mega-image.bb b/recipes-bsp/images/initramfs-firmware-mega-image.bb
index f9179e2c2..64bde7714 100644
--- a/recipes-bsp/images/initramfs-firmware-mega-image.bb
+++ b/recipes-bsp/images/initramfs-firmware-mega-image.bb
@@ -14,7 +14,7 @@ PACKAGE_INSTALL += " \
     packagegroup-hamoa-iot-evk-firmware \
     packagegroup-iq-8275-evk-firmware \
     packagegroup-iq-9075-evk-firmware \
-    packagegroup-qcs615-adp-air-firmware \
+    packagegroup-qcs615-ride-firmware \
     packagegroup-qcs8300-ride-firmware \
     packagegroup-rb1-firmware \
     packagegroup-rb2-firmware \
@@ -26,7 +26,7 @@ PACKAGE_INSTALL += " \
     packagegroup-hamoa-iot-evk-hexagon-dsp-binaries \
     packagegroup-iq-8275-evk-hexagon-dsp-binaries \
     packagegroup-iq-9075-evk-hexagon-dsp-binaries \
-    packagegroup-qcs615-adp-air-hexagon-dsp-binaries \
+    packagegroup-qcs615-ride-hexagon-dsp-binaries \
     packagegroup-qcs8300-ride-hexagon-dsp-binaries \
     packagegroup-rb1-hexagon-dsp-binaries \
     packagegroup-rb2-hexagon-dsp-binaries \
diff --git a/recipes-bsp/packagegroups/packagegroup-qcs615-adp-air.bb b/recipes-bsp/packagegroups/packagegroup-qcs615-ride.bb
similarity index 100%
rename from recipes-bsp/packagegroups/packagegroup-qcs615-adp-air.bb
rename to recipes-bsp/packagegroups/packagegroup-qcs615-ride.bb