diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 982a6fd0..b04be758 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,4 +16,4 @@
 
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_mako.mk \
-    $(LOCAL_DIR)/omni_mako.mk
+    $(LOCAL_DIR)/du.mk
diff --git a/du.dependencies b/du.dependencies
new file mode 100644
index 00000000..2580bd4b
--- /dev/null
+++ b/du.dependencies
@@ -0,0 +1,10 @@
+[
+ {
+   "repository": "android_kernel_lge_mako",
+   "target_path": "kernel/lge/mako"
+ },
+ {
+   "repository": "proprietary_vendor_lge",
+   "target_path": "vendor/lge"
+ }
+]
diff --git a/omni_mako.mk b/du.mk
similarity index 91%
rename from omni_mako.mk
rename to du.mk
index 0c3b3357..78421aab 100644
--- a/omni_mako.mk
+++ b/du.mk
@@ -21,13 +21,13 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
 
 # Inherit from our custom product configuration
-$(call inherit-product, vendor/omni/config/common.mk)
-$(call inherit-product, vendor/omni/config/gsm.mk)
+$(call inherit-product, vendor/du/config/common.mk)
+$(call inherit-product, vendor/du/config/gsm.mk)
 
 # Inherit from hardware-specific part of the product configuration
 $(call inherit-product, device/lge/mako/device.mk)
 
-PRODUCT_NAME := omni_mako
+PRODUCT_NAME := du_mako
 PRODUCT_DEVICE := mako
 PRODUCT_BRAND := google
 PRODUCT_MODEL := Nexus 4
diff --git a/omni.dependencies b/omni.dependencies
deleted file mode 100644
index c45ca2bb..00000000
--- a/omni.dependencies
+++ /dev/null
@@ -1,62 +0,0 @@
-[
-  {
-    "repository": "android_kernel_lge_mako",
-    "target_path": "kernel/lge/mako"
-  },
-  {
-    "repository": "android_hardware_qcom_audio",
-    "target_path": "hardware/qcom/audio",
-    "remote": "omnirom"
-  },
-  {
-    "repository": "android_hardware_qcom_display",
-    "target_path": "hardware/qcom/display",
-    "remote": "omnirom"
-  },
-  {
-    "repository": "android_hardware_qcom_media",
-    "target_path": "hardware/qcom/media",
-    "remote": "omnirom"
-  },
-  {
-    "repository": "android_hardware_qcom_power",
-    "target_path": "hardware/qcom/power",
-    "remote": "omnirom"
-  },
-  {
-    "repository": "platform/hardware/qcom/bt",
-    "target_path": "hardware/qcom/bt",
-    "remote": "aosp",
-    "revision": "android-4.4_r1"
-  },
-  {
-    "repository": "platform/hardware/qcom/camera",
-    "target_path": "hardware/qcom/camera",
-    "remote": "aosp",
-    "revision": "android-4.4_r1"
-  },
-  {
-    "repository": "platform/hardware/qcom/keymaster",
-    "target_path": "hardware/qcom/keymaster",
-    "remote": "aosp",
-    "revision": "android-4.4_r1"
-  },
-  {
-    "repository": "platform/hardware/qcom/msm8960",
-    "target_path": "hardware/qcom/msm8960",
-    "remote": "aosp",
-    "revision": "android-4.4_r1"
-  },
-  {
-    "repository": "platform/hardware/qcom/sensors",
-    "target_path": "hardware/qcom/sensors",
-    "remote": "aosp",
-    "revision": "android-4.4_r1"
-  },
-  {
-    "repository": "platform/hardware/qcom/wlan",
-    "target_path": "hardware/qcom/wlan",
-    "remote": "aosp",
-    "revision": "android-4.4_r1"
-  }
-]
diff --git a/sepolicy/file.te b/sepolicy/file.te
index 839b0a4b..77b0e1d2 100644
--- a/sepolicy/file.te
+++ b/sepolicy/file.te
@@ -3,5 +3,3 @@ type qmux_audio_socket, file_type;
 type qmux_bluetooth_socket, file_type;
 type qmux_gps_socket, file_type;
 type qmux_radio_socket, file_type;
-
-type audio_firmware_file, file_type;
diff --git a/vendorsetup.sh b/vendorsetup.sh
deleted file mode 100755
index 9e1b3cf0..00000000
--- a/vendorsetup.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright 2012 The Android Open Source 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.
-#
-
-add_lunch_combo aosp_mako-userdebug
-add_lunch_combo omni_mako-userdebug