diff --git a/Android.bp b/Android.bp
index 7ad8379..053d46a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * This file is generated by device/xiaomi/lancelot/setup-makefiles.sh
+ * This file is generated by device/xiaomi/lava/setup-makefiles.sh
  */
 
 soong_namespace {
-}
\ No newline at end of file
+}
diff --git a/Android.mk b/Android.mk
index 93e3397..aa596a4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is generated by device/xiaomi/lancelot/setup-makefiles.sh
+# This file is generated by device/xiaomi/lava/setup-makefiles.sh
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),lancelot)
+ifeq ($(TARGET_DEVICE),lava)
 
 endif
diff --git a/BoardConfigVendor.mk b/BoardConfigVendor.mk
index 5b584ea..a0b8b30 100644
--- a/BoardConfigVendor.mk
+++ b/BoardConfigVendor.mk
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is generated by device/xiaomi/lancelot/setup-makefiles.sh
+# This file is generated by device/xiaomi/lava/setup-makefiles.sh
 
diff --git a/lancelot-vendor.mk b/lancelot-vendor.mk
deleted file mode 100644
index aa10279..0000000
--- a/lancelot-vendor.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (C) 2020 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# This file is generated by device/xiaomi/lancelot/setup-makefiles.sh
-
-PRODUCT_SOONG_NAMESPACES += \
-    vendor/xiaomi/lancelot
-
-PRODUCT_COPY_FILES += \
-    vendor/xiaomi/lancelot/proprietary/lib64/libaptXHD_encoder.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libaptXHD_encoder.so \
-    vendor/xiaomi/lancelot/proprietary/lib64/libaptX_encoder.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libaptX_encoder.so \
-    vendor/xiaomi/lancelot/proprietary/bin/kpoc_charger:$(TARGET_COPY_OUT_SYSTEM)/bin/kpoc_charger \
-    vendor/xiaomi/lancelot/proprietary/etc/init/kpoc_charger.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/kpoc_charger.rc \
-    vendor/xiaomi/lancelot/proprietary/lib/libshowlogo.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libshowlogo.so \
-    vendor/xiaomi/lancelot/proprietary/etc/init/android.hardware.keymaster@4.0-service.beanpod.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/android.hardware.keymaster@4.0-service.beanpod.rc
diff --git a/lava-vendor.mk b/lava-vendor.mk
new file mode 100644
index 0000000..b36f760
--- /dev/null
+++ b/lava-vendor.mk
@@ -0,0 +1,26 @@
+# Copyright (C) 2020 The LineageOS Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file is generated by device/xiaomi/lava/setup-makefiles.sh
+
+PRODUCT_SOONG_NAMESPACES += \
+    vendor/xiaomi/lava
+
+PRODUCT_COPY_FILES += \
+    vendor/xiaomi/lava/proprietary/lib64/libaptXHD_encoder.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libaptXHD_encoder.so \
+    vendor/xiaomi/lava/proprietary/lib64/libaptX_encoder.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libaptX_encoder.so \
+    vendor/xiaomi/lava/proprietary/bin/kpoc_charger:$(TARGET_COPY_OUT_SYSTEM)/bin/kpoc_charger \
+    vendor/xiaomi/lava/proprietary/etc/init/kpoc_charger.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/kpoc_charger.rc \
+    vendor/xiaomi/lava/proprietary/lib/libshowlogo.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libshowlogo.so \
+    vendor/xiaomi/lava/proprietary/etc/init/android.hardware.keymaster@4.0-service.beanpod.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/android.hardware.keymaster@4.0-service.beanpod.rc