diff --git a/aosp_hammerhead.mk b/aosp_hammerhead.mk
index 83027d4..7e16e42 100644
--- a/aosp_hammerhead.mk
+++ b/aosp_hammerhead.mk
@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-$(call inherit-product, device/lge/mako/full_hammerhead.mk)
+$(call inherit-product, device/lge/hammerhead/full_hammerhead.mk)
 
 PRODUCT_NAME := aosp_hammerhead
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 4647295..ef4f8e1 100755
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -14,4 +14,4 @@
 # limitations under the License.
 #
 
-add_lunch_combo full_hammerhead-userdebug
+add_lunch_combo aosp_hammerhead-userdebug