big rename to n7000

14 files changed, 80 insertions, 102 deletions

diff --git a/Android.mk b/Android.mk
index 1047363..5a189f7 100755
--- a/Android.mk
+++ b/Android.mk
@@ -14,7 +14,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),galaxynote)
+ifeq ($(TARGET_DEVICE),n7000)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
 
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 639a468..edf1d73 100755
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,4 +15,4 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/full_galaxynote.mk
+    $(LOCAL_DIR)/full_n7000.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 101dca6..285da4c 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -31,7 +31,7 @@ ARCH_ARM_HAVE_TLS_REGISTER := true
 TARGET_BOARD_PLATFORM := exynos4
 TARGET_SOC := exynos4210
 TARGET_BOOTLOADER_BOARD_NAME := smdk4210
-TARGET_BOARD_INFO_FILE := device/samsung/galaxynote/board-info.txt
+TARGET_BOARD_INFO_FILE := device/samsung/n7000/board-info.txt
 
 EXYNOS4210_ENHANCEMENTS := true
 ifdef EXYNOS4210_ENHANCEMENTS
@@ -44,7 +44,7 @@ TARGET_NO_RADIOIMAGE := true
 
 TARGET_PROVIDES_INIT := true
 TARGET_PROVIDES_INIT_TARGET_RC := true
-TARGET_RECOVERY_INITRC := device/samsung/galaxynote/recovery.rc
+TARGET_RECOVERY_INITRC := device/samsung/n7000/recovery.rc
 
 BOARD_NAND_PAGE_SIZE := 4096 -s 128
 BOARD_KERNEL_PAGESIZE := 4096
@@ -53,7 +53,7 @@ BOARD_KERNEL_CMDLINE := console=ttySAC2,115200 consoleblank=0
 
 # Inline kernel building
 TARGET_KERNEL_SOURCE := kernel/samsung/smdk4210
-TARGET_KERNEL_CONFIG := cyanogenmod_galaxynote_defconfig
+TARGET_KERNEL_CONFIG := cyanogenmod_n7000_defconfig
 
 # Filesystem
 TARGET_USERIMAGES_USE_EXT4 := true
@@ -63,11 +63,11 @@ BOARD_USERDATAIMAGE_PARTITION_SIZE := 2147483648
 BOARD_FLASH_BLOCK_SIZE := 4096
 
 # Releasetools
-TARGET_RELEASETOOL_OTA_FROM_TARGET_SCRIPT := ./device/samsung/galaxynote/releasetools/galaxynote_ota_from_target_files
-TARGET_RELEASETOOL_IMG_FROM_TARGET_SCRIPT := ./device/samsung/galaxynote/releasetools/galaxynote_img_from_target_files
+TARGET_RELEASETOOL_OTA_FROM_TARGET_SCRIPT := ./device/samsung/n7000/releasetools/n7000_ota_from_target_files
+TARGET_RELEASETOOL_IMG_FROM_TARGET_SCRIPT := ./device/samsung/n7000/releasetools/n7000_img_from_target_files
 
 # Graphics (Mali 400)
-BOARD_EGL_CFG := device/samsung/galaxynote/configs/egl.cfg
+BOARD_EGL_CFG := device/samsung/n7000/configs/egl.cfg
 USE_OPENGL_RENDERER := true
 BOARD_USES_HWCOMPOSER := true
 BOARD_USE_SECTVOUT := true
@@ -94,21 +94,21 @@ BOARD_MOBILEDATA_INTERFACE_NAME := "pdp0"
 #BOARD_FM_DEVICE := si4709
 
 # WiFi (BCM4330)
-BOARD_WLAN_DEVICE           := bcmdhd
-BOARD_WLAN_DEVICE_REV       := bcm4330_b1
-WPA_SUPPLICANT_VERSION      := VER_0_8_X
-BOARD_WPA_SUPPLICANT_DRIVER := NL80211
+BOARD_WLAN_DEVICE           	 := bcmdhd
+BOARD_WLAN_DEVICE_REV       	 := bcm4330_b1
+WPA_SUPPLICANT_VERSION      	 := VER_0_8_X
+BOARD_WPA_SUPPLICANT_DRIVER 	 := NL80211
 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_bcmdhd
-BOARD_HOSTAPD_DRIVER        := NL80211
-BOARD_HOSTAPD_PRIVATE_LIB   := lib_driver_cmd_bcmdhd
+BOARD_HOSTAPD_DRIVER        	 := NL80211
+BOARD_HOSTAPD_PRIVATE_LIB   	 := lib_driver_cmd_bcmdhd
 WIFI_DRIVER_MODULE_PATH          := "/system/lib/modules/dhd.ko"
-WIFI_DRIVER_FW_PATH_PARAM   := "/sys/module/dhd/parameters/firmware_path"
+WIFI_DRIVER_FW_PATH_PARAM   	 := "/sys/module/dhd/parameters/firmware_path"
 WIFI_DRIVER_FW_PATH_STA          := "/system/etc/wifi/bcm4330_sta.bin"
 WIFI_DRIVER_FW_PATH_AP           := "/system/etc/wifi/bcm4330_apsta.bin"
 WIFI_DRIVER_FW_PATH_P2P          := "/system/etc/wifi/bcm4330_p2p.bin"
 WIFI_DRIVER_MODULE_NAME          := "dhd"
 WIFI_DRIVER_MODULE_ARG           := "firmware_path=/system/etc/wifi/bcm4330_sta.bin nvram_path=/system/etc/wifi/nvram_net.txt"
-WIFI_BAND             := 802_11_ABG
+WIFI_BAND             			 := 802_11_ABG
 
 # Bluetooth
 BOARD_HAVE_BLUETOOTH := true
@@ -121,20 +121,20 @@ BOARD_VOLD_DISC_HAS_MULTIPLE_MAJORS := true
 TARGET_USE_CUSTOM_LUN_FILE_PATH := "/sys/devices/platform/s3c-usbgadget/gadget/lun%d/file"
 
 # Recovery
-BOARD_CUSTOM_RECOVERY_KEYMAPPING := ../../device/samsung/galaxynote/recovery/recovery_keys.c
-BOARD_CUSTOM_GRAPHICS := ../../../device/samsung/galaxynote/recovery/graphics.c
+BOARD_CUSTOM_RECOVERY_KEYMAPPING := ../../device/samsung/n7000/recovery/recovery_keys.c
+BOARD_CUSTOM_GRAPHICS := ../../../device/samsung/n7000/recovery/graphics.c
 BOARD_UMS_LUNFILE := "/sys/class/android_usb/f_mass_storage/lun0/file"
 BOARD_USES_MMCUTILS := true
 BOARD_HAS_NO_MISC_PARTITION := true 
 BOARD_HAS_NO_SELECT_BUTTON := true
 BOARD_USE_CUSTOM_RECOVERY_FONT := \"roboto_15x24.h\"
 
-TARGET_SPECIFIC_HEADER_PATH := device/samsung/galaxynote/overlay/include
+TARGET_SPECIFIC_HEADER_PATH := device/samsung/n7000/overlay/include
 
 # assert
-TARGET_OTA_ASSERT_DEVICE := galaxynote,GT-N7000
+TARGET_OTA_ASSERT_DEVICE := n7000,GT-N7000
 
 # Use the non-open-source parts, if they're present
--include vendor/samsung/galaxynote/BoardConfigVendor.mk
+-include vendor/samsung/n7000/BoardConfigVendor.mk
 
-BOARD_CUSTOM_BOOTIMG_MK := device/samsung/galaxynote/shbootimg.mk
+BOARD_CUSTOM_BOOTIMG_MK := device/samsung/n7000/shbootimg.mk
diff --git a/cm.mk b/cm.mk
index 5ac2fe9..c574095 100755
--- a/cm.mk
+++ b/cm.mk
@@ -2,17 +2,17 @@
 $(call inherit-product, vendor/cm/config/gsm.mk)

 

 # Release name

-PRODUCT_RELEASE_NAME := GALAXYNOTE

+PRODUCT_RELEASE_NAME := N7000

 

 # Inherit some common CM stuff.

 $(call inherit-product, vendor/cm/config/common_full_phone.mk)

 

 # Inherit device configuration

-$(call inherit-product, device/samsung/galaxynote/full_galaxynote.mk)

+$(call inherit-product, device/samsung/n7000/full_n7000.mk)

 

 ## Device identifier. This must come after all inclusions

-PRODUCT_DEVICE := galaxynote

-PRODUCT_NAME := cm_galaxynote

+PRODUCT_DEVICE := n7000

+PRODUCT_NAME := cm_n7000

 PRODUCT_BRAND := Samsung

 PRODUCT_MODEL := GT-N7000

 

diff --git a/extract-files.sh b/extract-files.sh
index 19b754e..e74f72d 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -16,7 +16,7 @@
 
 # This file is generated by device/common/generate-blob-scripts.sh - DO NOT EDIT
 
-DEVICE=galaxynote
+DEVICE=n7000
 DEVICE_PROPRIETARIES=$DEVICE
 COMMON=galaxynote-common
 MANUFACTURER=samsung
diff --git a/full_galaxynote.mk b/full_n7000.mk
index ca1a282..fce00f8 100755
--- a/full_galaxynote.mk
+++ b/full_n7000.mk
@@ -23,11 +23,11 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 #$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
 #$(call inherit-product, $(SRC_TARGET_DIR)/product/full.mk)
-$(call inherit-product, device/samsung/galaxynote/galaxynote.mk)
+$(call inherit-product, device/samsung/n7000/n7000.mk)
 
 # Discard inherited values and use our own instead.
-PRODUCT_NAME := full_galaxynote
-PRODUCT_DEVICE := galaxynote
+PRODUCT_NAME := full_n7000
+PRODUCT_DEVICE := n7000
 PRODUCT_BRAND := samsung
 PRODUCT_MANUFACTURER := samsung
 PRODUCT_MODEL := GT-N7000
diff --git a/galaxynote.mk b/n7000.mk
index 2576d18..cc0ccb2 100755
--- a/galaxynote.mk
+++ b/n7000.mk
@@ -11,7 +11,8 @@
 # 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.
-DEVICE_PACKAGE_OVERLAYS := device/samsung/galaxynote/overlay
+
+DEVICE_PACKAGE_OVERLAYS := device/samsung/n7000/overlay
 
 # This device is hdpi.
 PRODUCT_AAPT_CONFIG := normal hdpi xhdpi
@@ -23,27 +24,27 @@ TARGET_BOOTANIMATION_NAME := vertical-720x1280
 
 # Init files
 PRODUCT_COPY_FILES := \
-	device/samsung/galaxynote/lpm.rc:root/lpm.rc \
-	device/samsung/galaxynote/init.smdk4210.usb.rc:root/init.smdk4210.usb.rc \
-	device/samsung/galaxynote/init.smdk4210.rc:root/init.smdk4210.rc \
-	device/samsung/galaxynote/ueventd.smdk4210.rc:root/ueventd.smdk4210.rc
+	device/samsung/n7000/lpm.rc:root/lpm.rc \
+	device/samsung/n7000/init.smdk4210.usb.rc:root/init.smdk4210.usb.rc \
+	device/samsung/n7000/init.smdk4210.rc:root/init.smdk4210.rc \
+	device/samsung/n7000/ueventd.smdk4210.rc:root/ueventd.smdk4210.rc
 
 # Audio
 PRODUCT_COPY_FILES += \
-	device/samsung/galaxynote/configs/asound.conf:system/etc/asound.conf
+	device/samsung/n7000/configs/asound.conf:system/etc/asound.conf
 
 # Vold and Storage
 PRODUCT_COPY_FILES += \
-	device/samsung/galaxynote/configs/vold.fstab:system/etc/vold.fstab
+	device/samsung/n7000/configs/vold.fstab:system/etc/vold.fstab
 
 PRODUCT_PROPERTY_OVERRIDES := \
     ro.vold.switchablepair=/mnt/sdcard,/mnt/emmc
 
 # Wifi
 PRODUCT_COPY_FILES += \
-	device/samsung/galaxynote/configs/nvram_net.txt:system/etc/nvram_net.txt \
-	device/samsung/galaxynote/configs/nvram_mfg.txt:system/etc/nvram_mfg.txt \
-	device/samsung/galaxynote/configs/bcmdhd.cal:system/etc/wifi/bcmdhd.cal
+	device/samsung/n7000/configs/nvram_net.txt:system/etc/nvram_net.txt \
+	device/samsung/n7000/configs/nvram_mfg.txt:system/etc/nvram_mfg.txt \
+	device/samsung/n7000/configs/bcmdhd.cal:system/etc/wifi/bcmdhd.cal
 
 PRODUCT_PROPERTY_OVERRIDES += \
 	wifi.interface=wlan0 \
@@ -51,7 +52,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # Gps
 PRODUCT_COPY_FILES += \
-	device/samsung/galaxynote/configs/gps.conf:system/etc/gps.conf
+	device/samsung/n7000/configs/gps.conf:system/etc/gps.conf
 
 # Packages
 PRODUCT_PACKAGES := \
@@ -99,7 +100,7 @@ PRODUCT_PACKAGES += \
     libOMX.SEC.MP3.Decoder
 
 PRODUCT_COPY_FILES += \
-    device/samsung/galaxynote/configs/media_profiles.xml:system/etc/media_profiles.xml
+    device/samsung/n7000/configs/media_profiles.xml:system/etc/media_profiles.xml
 
 # Ril
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -130,41 +131,41 @@ PRODUCT_PACKAGES += \
 
 # Keylayout
 PRODUCT_COPY_FILES += \
-    device/samsung/galaxynote/usr/keylayout/AVRCP.kl:system/usr/keylayout/AVRCP.kl \
-    device/samsung/galaxynote/usr/keylayout/Generic.kl:system/usr/keylayout/Generic.kl \
-    device/samsung/galaxynote/usr/keylayout/gpio-keys.kl:system/usr/keylayout/gpio-keys.kl \
-    device/samsung/galaxynote/usr/keylayout/max8997-muic.kl:system/usr/keylayout/max8997-muic.kl \
-    device/samsung/galaxynote/usr/keylayout/melfas-touchkey.kl:system/usr/keylayout/melfas-touchkey.kl \
-    device/samsung/galaxynote/usr/keylayout/qwerty.kl:system/usr/keylayout/qwerty.kl \
-    device/samsung/galaxynote/usr/keylayout/samsung-keypad.kl:system/usr/keylayout/samsung-keypad.kl \
-    device/samsung/galaxynote/usr/keylayout/sec_key.kl:system/usr/keylayout/sec_key.kl \
-    device/samsung/galaxynote/usr/keylayout/sec_touchkey.kl:system/usr/keylayout/sec_touchkey.kl \
-    device/samsung/galaxynote/usr/keylayout/sii9234_rcp.kl:system/usr/keylayout/sii9234_rcp.kl \
-    device/samsung/galaxynote/usr/keylayout/Vendor_04e8_Product_7021.kl:system/usr/keylayout/Vendor_04e8_Product_7021.kl \
-    device/samsung/galaxynote/usr/keylayout/Vendor_05ac_Product_0239.kl:system/usr/keylayout/Vendor_05ac_Product_0239.kl \
-    device/samsung/galaxynote/usr/keylayout/Vendor_22b8_Product_093d.kl:system/usr/keylayout/Vendor_22b8_Product_093d.kl \
-    device/samsung/galaxynote/usr/keylayout/Vendor_045e_Product_028e.kl:system/usr/keylayout/Vendor_045e_Product_028e.kl \
-    device/samsung/galaxynote/usr/keylayout/Vendor_046d_Product_c216.kl:system/usr/keylayout/Vendor_046d_Product_c216.kl \
-    device/samsung/galaxynote/usr/keylayout/Vendor_046d_Product_c294.kl:system/usr/keylayout/Vendor_046d_Product_c294.kl \
-    device/samsung/galaxynote/usr/keylayout/Vendor_046d_Product_c299.kl:system/usr/keylayout/Vendor_046d_Product_c299.kl \
-    device/samsung/galaxynote/usr/keylayout/Vendor_046d_Product_c532.kl:system/usr/keylayout/Vendor_046d_Product_c532.kl \
-    device/samsung/galaxynote/usr/keylayout/Vendor_054c_Product_0268.kl:system/usr/keylayout/Vendor_054c_Product_0268.kl
+    device/samsung/n7000/usr/keylayout/AVRCP.kl:system/usr/keylayout/AVRCP.kl \
+    device/samsung/n7000/usr/keylayout/Generic.kl:system/usr/keylayout/Generic.kl \
+    device/samsung/n7000/usr/keylayout/gpio-keys.kl:system/usr/keylayout/gpio-keys.kl \
+    device/samsung/n7000/usr/keylayout/max8997-muic.kl:system/usr/keylayout/max8997-muic.kl \
+    device/samsung/n7000/usr/keylayout/melfas-touchkey.kl:system/usr/keylayout/melfas-touchkey.kl \
+    device/samsung/n7000/usr/keylayout/qwerty.kl:system/usr/keylayout/qwerty.kl \
+    device/samsung/n7000/usr/keylayout/samsung-keypad.kl:system/usr/keylayout/samsung-keypad.kl \
+    device/samsung/n7000/usr/keylayout/sec_key.kl:system/usr/keylayout/sec_key.kl \
+    device/samsung/n7000/usr/keylayout/sec_touchkey.kl:system/usr/keylayout/sec_touchkey.kl \
+    device/samsung/n7000/usr/keylayout/sii9234_rcp.kl:system/usr/keylayout/sii9234_rcp.kl \
+    device/samsung/n7000/usr/keylayout/Vendor_04e8_Product_7021.kl:system/usr/keylayout/Vendor_04e8_Product_7021.kl \
+    device/samsung/n7000/usr/keylayout/Vendor_05ac_Product_0239.kl:system/usr/keylayout/Vendor_05ac_Product_0239.kl \
+    device/samsung/n7000/usr/keylayout/Vendor_22b8_Product_093d.kl:system/usr/keylayout/Vendor_22b8_Product_093d.kl \
+    device/samsung/n7000/usr/keylayout/Vendor_045e_Product_028e.kl:system/usr/keylayout/Vendor_045e_Product_028e.kl \
+    device/samsung/n7000/usr/keylayout/Vendor_046d_Product_c216.kl:system/usr/keylayout/Vendor_046d_Product_c216.kl \
+    device/samsung/n7000/usr/keylayout/Vendor_046d_Product_c294.kl:system/usr/keylayout/Vendor_046d_Product_c294.kl \
+    device/samsung/n7000/usr/keylayout/Vendor_046d_Product_c299.kl:system/usr/keylayout/Vendor_046d_Product_c299.kl \
+    device/samsung/n7000/usr/keylayout/Vendor_046d_Product_c532.kl:system/usr/keylayout/Vendor_046d_Product_c532.kl \
+    device/samsung/n7000/usr/keylayout/Vendor_054c_Product_0268.kl:system/usr/keylayout/Vendor_054c_Product_0268.kl
 
 # Keychars
 PRODUCT_COPY_FILES += \
-    device/samsung/galaxynote/usr/keychars/Generic.kcm:system/usr/keychars/Generic.kcm \
-    device/samsung/galaxynote/usr/keychars/qwerty.kcm:system/usr/keychars/qwerty.kcm \
-    device/samsung/galaxynote/usr/keychars/qwerty2.kcm:system/usr/keychars/qwerty2.kcm \
-    device/samsung/galaxynote/usr/keychars/Virtual.kcm:system/usr/keychars/Virtual.kcm
+    device/samsung/n7000/usr/keychars/Generic.kcm:system/usr/keychars/Generic.kcm \
+    device/samsung/n7000/usr/keychars/qwerty.kcm:system/usr/keychars/qwerty.kcm \
+    device/samsung/n7000/usr/keychars/qwerty2.kcm:system/usr/keychars/qwerty2.kcm \
+    device/samsung/n7000/usr/keychars/Virtual.kcm:system/usr/keychars/Virtual.kcm
 
 #idc
 PRODUCT_COPY_FILES += \
-    device/samsung/galaxynote/usr/idc/melfas_ts.idc:system/usr/idc/melfas_ts.idc \
-    device/samsung/galaxynote/usr/idc/mxt224_ts_input.idc:system/usr/idc/mxt224_ts_input.idc \
-    device/samsung/galaxynote/usr/idc/qwerty.idc:system/usr/idc/qwerty.idc \
-    device/samsung/galaxynote/usr/idc/qwerty2.idc:system/usr/idc/qwerty2.idc \
-    device/samsung/galaxynote/usr/idc/sec_touchscreen.idc:system/usr/idc/sec_touchscreen.idc \
-    device/samsung/galaxynote/usr/idc/sec_e-pen.idc:system/usr/idc/sec_e-pen.idc
+    device/samsung/n7000/usr/idc/melfas_ts.idc:system/usr/idc/melfas_ts.idc \
+    device/samsung/n7000/usr/idc/mxt224_ts_input.idc:system/usr/idc/mxt224_ts_input.idc \
+    device/samsung/n7000/usr/idc/qwerty.idc:system/usr/idc/qwerty.idc \
+    device/samsung/n7000/usr/idc/qwerty2.idc:system/usr/idc/qwerty2.idc \
+    device/samsung/n7000/usr/idc/sec_touchscreen.idc:system/usr/idc/sec_touchscreen.idc \
+    device/samsung/n7000/usr/idc/sec_e-pen.idc:system/usr/idc/sec_e-pen.idc
 
 # These are the hardware-specific features
 PRODUCT_COPY_FILES += \
@@ -211,5 +212,5 @@ $(call inherit-product, frameworks/base/build/phone-xhdpi-1024-dalvik-heap.mk)
 # Include exynos4 platform specific parts
 $(call inherit-product, hardware/samsung/exynos4/Android.mk)
 
-$(call inherit-product-if-exists, vendor/samsung/galaxynote/galaxynote-vendor.mk)
+$(call inherit-product-if-exists, vendor/samsung/n7000/n7000-vendor.mk)
 $(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4330/device-bcm.mk)
diff --git a/releasetools/galaxynote_common.py b/releasetools/n7000_common.py
index 93f1b8e..93f1b8e 100755
--- a/releasetools/galaxynote_common.py
+++ b/releasetools/n7000_common.py
diff --git a/releasetools/galaxynote_edify_generator.py b/releasetools/n7000_edify_generator.py
index 95bdf48..95bdf48 100755
--- a/releasetools/galaxynote_edify_generator.py
+++ b/releasetools/n7000_edify_generator.py
diff --git a/releasetools/galaxynote_img_from_target_files b/releasetools/n7000_img_from_target_files
index 4721401..f9a5904 100755
--- a/releasetools/galaxynote_img_from_target_files
+++ b/releasetools/n7000_img_from_target_files
@@ -43,7 +43,7 @@ import zipfile
 if not hasattr(os, "SEEK_SET"):
   os.SEEK_SET = 0
 
-import galaxynote_common as common
+import n7000_common as common
 
 OPTIONS = common.OPTIONS
 
diff --git a/releasetools/galaxynote_ota_from_target_files b/releasetools/n7000_ota_from_target_files
index 06b7918..53a2893 100755
--- a/releasetools/galaxynote_ota_from_target_files
+++ b/releasetools/n7000_ota_from_target_files
@@ -16,7 +16,7 @@
 
 import sys
 import os
-import galaxynote_common as common
+import n7000_common as common
 
 LOCAL_DIR = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..'))
 RELEASETOOLS_DIR = os.path.abspath(os.path.join(LOCAL_DIR, '../../../build/tools/releasetools'))
@@ -31,7 +31,7 @@ filename = os.path.join(RELEASETOOLS_DIR, "ota_from_target_files")
 ota_from_target_files = common.load_module_from_file('ota_from_target_files', filename)
 
 from ota_from_target_files import *
-import galaxynote_edify_generator as edify_generator
+import n7000_edify_generator as edify_generator
 
 __doc__ = ota_from_target_files.__doc__
 
@@ -108,7 +108,7 @@ ota_from_target_files.WriteFullOTAPackage = WriteFullOTAPackage
 
 
 def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip):
-    print "Incremental OTA Packages are not support on the galaxynote at this time"
+    print "Incremental OTA Packages are not support on the n7000 at this time"
     sys.exit(1)
 ota_from_target_files.WriteIncrementalOTAPackage = WriteIncrementalOTAPackage
 
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 3e7fc82..bef473e 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -14,13 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DEVICE=galaxynote
+DEVICE=n7000
 COMMON=galaxynote-common
 MANUFACTURER=samsung
 
 mkdir -p ../../../vendor/$MANUFACTURER/$DEVICE
 
-(cat << EOF) | sed s/__DEVICE__/$DEVICE/g | sed s/__COMMON__/$COMMON/g | sed s/__MANUFACTURER__/$MANUFACTURER/g > ../../../vendor/$MANUFACTURER/$DEVICE/galaxynote-vendor.mk
+(cat << EOF) | sed s/__DEVICE__/$DEVICE/g | sed s/__COMMON__/$COMMON/g | sed s/__MANUFACTURER__/$MANUFACTURER/g > ../../../vendor/$MANUFACTURER/$DEVICE/$DEVICE-vendor.mk
 # Copyright (C) 2010 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/system.prop b/system.prop
index 90c6593..d4c4159 100644
--- a/system.prop
+++ b/system.prop
@@ -1,5 +1,5 @@
 #
-# system.prop for galaxys2
+# system.prop for n7000
 #
 
 rild.libpath=/system/lib/libsec-ril.so
diff --git a/vendorsetup.sh b/vendorsetup.sh
deleted file mode 100755
index e062dcd..0000000
--- a/vendorsetup.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2008 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.
-#
-
-# This file is executed by build/envsetup.sh, and can use anything
-# defined in envsetup.sh.
-#
-# In particular, you can add lunch options with the add_lunch_combo
-# function: add_lunch_combo generic-eng
-
-add_lunch_combo full_galaxynote-eng