diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 26bf221..e1cd660 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -4,4 +4,4 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/lineage_bangkk.mk
+    $(LOCAL_DIR)/lineage_rhodep.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 5e817d6..931e783 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -3,13 +3,13 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-DEVICE_PATH := device/motorola/bangkk
+DEVICE_PATH := device/motorola/rhodep
 
 # Inherit from motorola sm6375-common
 include device/motorola/sm6375-common/BoardConfigCommon.mk
 
 # Bootloader
-TARGET_BOOTLOADER_BOARD_NAME := bangkk
+TARGET_BOOTLOADER_BOARD_NAME := rhodep
 
 # HIDL
 ODM_MANIFEST_SKUS += b d de dn n
@@ -20,8 +20,8 @@ ODM_MANIFEST_DN_FILES := $(DEVICE_PATH)/sku/manifest_dn.xml
 ODM_MANIFEST_N_FILES := $(DEVICE_PATH)/sku/manifest_n.xml
 
 # Kernel
-BOARD_KERNEL_CMDLINE += androidboot.hab.product=bangkk
-TARGET_KERNEL_CONFIG += vendor/ext_config/moto-holi-bangkk.config
+BOARD_KERNEL_CMDLINE += androidboot.hab.product=rhodep
+TARGET_KERNEL_CONFIG += vendor/ext_config/moto-holi-rhodep.config
 
 # Kernel Modules
 BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load))
@@ -50,4 +50,4 @@ BOARD_AVB_ROLLBACK_INDEX := 18
 BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := 18
 
 # inherit from the proprietary version
-include vendor/motorola/bangkk/BoardConfigVendor.mk
+include vendor/motorola/rhodep/BoardConfigVendor.mk
diff --git a/README.md b/README.md
index ccaf761..6e83f21 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
-Device tree for the Motorola moto g84
+Device tree for the Motorola moto g82
 
-Information about the device, build and install instructions can be found [here](http://wiki.lineageos.org/devices/bangkk/)
+Information about the device, build and install instructions can be found [here](http://wiki.lineageos.org/devices/rhodep/)
diff --git a/device.mk b/device.mk
index 6835cbd..6747731 100644
--- a/device.mk
+++ b/device.mk
@@ -91,7 +91,7 @@ $(foreach DEVICE_SKU, $(NFC_DEVICE_SKUS), \
 
 # Sensors
 PRODUCT_PACKAGES += \
-    sensors.bangkk
+    sensors.rhodep
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf
@@ -100,4 +100,4 @@ PRODUCT_COPY_FILES += \
 PRODUCT_SOONG_NAMESPACES += $(LOCAL_PATH)
 
 # Inherit from vendor blobs
-$(call inherit-product, vendor/motorola/bangkk/bangkk-vendor.mk)
+$(call inherit-product, vendor/motorola/rhodep/rhodep-vendor.mk)
diff --git a/extract-files.py b/extract-files.py
index d32f7f9..631d986 100755
--- a/extract-files.py
+++ b/extract-files.py
@@ -20,7 +20,7 @@ from extract_utils.main import (
 )
 
 namespace_imports = [
-    'device/motorola/bangkk',
+    'device/motorola/rhodep',
     'hardware/motorola',
     'vendor/motorola/sm6375-common',
     'vendor/qcom/opensource/display',
@@ -52,7 +52,7 @@ extract_fns: extract_fns_user_type = {
 }
 
 module = ExtractUtilsModule(
-    'bangkk',
+    'rhodep',
     'motorola',
     blob_fixups=blob_fixups,
     lib_fixups=lib_fixups,
diff --git a/lineage_bangkk.mk b/lineage_rhodep.mk
similarity index 58%
rename from lineage_bangkk.mk
rename to lineage_rhodep.mk
index 9583848..926fae0 100644
--- a/lineage_bangkk.mk
+++ b/lineage_rhodep.mk
@@ -8,21 +8,21 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 TARGET_SUPPORTS_OMX_SERVICE := false
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 
-# Inherit from bangkk device
-$(call inherit-product, device/motorola/bangkk/device.mk)
+# Inherit from rhodep device
+$(call inherit-product, device/motorola/rhodep/device.mk)
 
 # Inherit some common Lineage stuff.
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
-PRODUCT_NAME := lineage_bangkk
-PRODUCT_DEVICE := bangkk
+PRODUCT_NAME := lineage_rhodep
+PRODUCT_DEVICE := rhodep
 PRODUCT_MANUFACTURER := motorola
 PRODUCT_BRAND := motorola
-PRODUCT_MODEL := moto g84 5G
+PRODUCT_MODEL := moto g82 5G
 
 PRODUCT_GMS_CLIENTID_BASE := android-motorola
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    BuildDesc="bangkk_g-user 14 U1TCS34.22-64-19-4-4 c947fb-430a4c release-keys MUR1-0.90" \
-    BuildFingerprint=motorola/bangkk_g/bangkk:14/U1TCS34.22-64-19-4-4/c947fb-430a4c:user/release-keys \
-    DeviceProduct=bangkk_g
+    BuildDesc="rhodep_g-user 13 T1SUS33.1-124-6-16 5406e-b418a2 release-keys" \
+    BuildFingerprint=motorola/rhodep_g/rhodep:13/T1SUS33.1-124-6-16/5406e-b418a2:user/release-keys \
+    DeviceProduct=rhodep_g
diff --git a/product.prop b/product.prop
index 62c60d1..5d31150 100644
--- a/product.prop
+++ b/product.prop
@@ -3,7 +3,7 @@ masterclear.allow_retain_esim_profiles_after_fdr=true
 ro.telephony.esim_slot_id=1
 
 # Google
-ro.opa.device_model_id=motorola-bangkk
+ro.opa.device_model_id=motorola-rhodep
 
 # Motorola
 ro.mot.build.customerid=global
diff --git a/resource-overlay/device/Frameworks/res/values/config.xml b/resource-overlay/device/Frameworks/res/values/config.xml
index 0f3db12..d2a92f0 100644
--- a/resource-overlay/device/Frameworks/res/values/config.xml
+++ b/resource-overlay/device/Frameworks/res/values/config.xml
@@ -157,7 +157,7 @@
     </integer-array>
 
     <!-- MMS user agent string -->
-    <string name="config_mms_user_agent" translatable="false">motog845g</string>
+    <string name="config_mms_user_agent" translatable="false">motog825g</string>
 
     <!-- MMS user agent prolfile url -->
     <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.motorola.com/phoneconfig/motov1/Profile/motov1.rdf</string>
diff --git a/resource-overlay/device/Wifi/res/values/config.xml b/resource-overlay/device/Wifi/res/values/config.xml
index fd66567..54a1ce4 100644
--- a/resource-overlay/device/Wifi/res/values/config.xml
+++ b/resource-overlay/device/Wifi/res/values/config.xml
@@ -5,5 +5,5 @@
 -->
 <resources>
     <!-- Do not translate. Default access point SSID used for tethering -->
-    <string name="wifi_tether_configure_ssid_default" translatable="false">moto g84 5G</string>
+    <string name="wifi_tether_configure_ssid_default" translatable="false">moto g82 5G</string>
 </resources>
diff --git a/sensors/Android.bp b/sensors/Android.bp
index bb988dd..7e766dd 100644
--- a/sensors/Android.bp
+++ b/sensors/Android.bp
@@ -4,7 +4,7 @@
 //
 
 cc_library_shared {
-    name: "sensors.bangkk",
+    name: "sensors.rhodep",
     defaults: ["hidl_defaults"],
     srcs: [
         "Sensor.cpp",
@@ -28,7 +28,7 @@ cc_library_shared {
         "android.hardware.sensors@2.X-multihal",
     ],
     cflags: [
-        "-DLOG_TAG=\"sensors.bangkk\"",
+        "-DLOG_TAG=\"sensors.rhodep\"",
     ],
     vendor: true,
 }
diff --git a/sensors/hals.conf b/sensors/hals.conf
index ff4afd7..e6a5ee3 100644
--- a/sensors/hals.conf
+++ b/sensors/hals.conf
@@ -1,3 +1,3 @@
 sensors.ssc.so
 sensors.moto.so
-sensors.bangkk.so
+sensors.rhodep.so