diff --git a/Android.mk b/Android.mk
index 72380783..90e4b76c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,7 +16,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),i9300)
+ifeq ($(TARGET_DEVICE),n7100)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
 
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index d8577d94..e0a04cc1 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,4 +15,4 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/full_i9300.mk
+    $(LOCAL_DIR)/full_n7100.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index cbfff37b..924baaa1 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -48,13 +48,13 @@ TARGET_NO_RADIOIMAGE := true
 
 TARGET_PROVIDES_INIT := true
 TARGET_PROVIDES_INIT_TARGET_RC := true
-TARGET_RECOVERY_INITRC := device/samsung/i9300/recovery.rc
+TARGET_RECOVERY_INITRC := device/samsung/n7100/recovery.rc
 
-TARGET_SPECIFIC_HEADER_PATH := device/samsung/i9300/overlay/include
+TARGET_SPECIFIC_HEADER_PATH := device/samsung/n7100/overlay/include
 
 # Kernel
 TARGET_KERNEL_SOURCE := kernel/samsung/smdk4412
-TARGET_KERNEL_CONFIG := cyanogenmod_i9300_defconfig
+TARGET_KERNEL_CONFIG := cyanogenmod_n7100_defconfig
 BOARD_KERNEL_CMDLINE := "console=ttySAC2,115200"
 BOARD_KERNEL_BASE := 0x40000000
 BOARD_KERNEL_PAGESIZE := 2048
@@ -70,7 +70,7 @@ BOARD_FLASH_BLOCK_SIZE := 4096
 TARGET_USERIMAGES_USE_EXT4 := true
 
 # Graphics
-BOARD_EGL_CFG := device/samsung/i9300/configs/egl.cfg
+BOARD_EGL_CFG := device/samsung/n7100/configs/egl.cfg
 USE_OPENGL_RENDERER := true
 BOARD_USES_SKIAHWJPEG := true
 COMMON_GLOBAL_CFLAGS += -DSEC_HWJPEG_G2D
@@ -135,8 +135,8 @@ BOARD_HAVE_SAMSUNG_BLUETOOTH := true
 TARGET_USE_CUSTOM_LUN_FILE_PATH := "/sys/devices/platform/s3c-usbgadget/gadget/lun%d/file"
 
 # Recovery
-BOARD_CUSTOM_RECOVERY_KEYMAPPING := ../../device/samsung/i9300/recovery/recovery_keys.c
-BOARD_CUSTOM_GRAPHICS := ../../../device/samsung/i9300/recovery/graphics.c
+BOARD_CUSTOM_RECOVERY_KEYMAPPING := ../../device/samsung/n7100/recovery/recovery_keys.c
+BOARD_CUSTOM_GRAPHICS := ../../../device/samsung/n7100/recovery/graphics.c
 BOARD_USE_CUSTOM_RECOVERY_FONT := \"roboto_15x24.h\"
 BOARD_UMS_LUNFILE := "/sys/class/android_usb/android0/f_mass_storage/lun0/file"
 BOARD_USES_MMCUTILS := true
@@ -149,7 +149,7 @@ BOARD_CHARGING_MODE_BOOTING_LPM := /sys/class/power_supply/battery/batt_lp_charg
 BOARD_BATTERY_DEVICE_NAME := "battery"
 
 # assert
-TARGET_OTA_ASSERT_DEVICE := m0,i9300,GT-I9300
+TARGET_OTA_ASSERT_DEVICE := m0,n7100,GT-N7100
 
 # inherit from the proprietary version
--include vendor/samsung/i9300/BoardConfigVendor.mk
+-include vendor/samsung/n7100/BoardConfigVendor.mk
diff --git a/cm.mk b/cm.mk
index 20569b76..43f66498 100644
--- a/cm.mk
+++ b/cm.mk
@@ -2,7 +2,7 @@
 $(call inherit-product, vendor/cm/config/gsm.mk)
 
 # Release name
-PRODUCT_RELEASE_NAME := i9300
+PRODUCT_RELEASE_NAME := n7100
 
 # Boot animation
 TARGET_SCREEN_HEIGHT := 1280
@@ -12,14 +12,14 @@ TARGET_SCREEN_WIDTH := 720
 $(call inherit-product, vendor/cm/config/common_full_phone.mk)
 
 # Inherit device configuration
-$(call inherit-product, device/samsung/i9300/full_i9300.mk)
+$(call inherit-product, device/samsung/n7100/full_n7100.mk)
 
 # Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := i9300
-PRODUCT_NAME := cm_i9300
+PRODUCT_DEVICE := n7100
+PRODUCT_NAME := cm_n7100
 PRODUCT_BRAND := samsung
-PRODUCT_MODEL := GT-I9300
+PRODUCT_MODEL := GT-N7100
 PRODUCT_MANUFACTURER := samsung
 
 # Set build fingerprint / ID / Product Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=m0xx TARGET_DEVICE=m0 BUILD_FINGERPRINT="samsung/m0xx/m0:4.1.1/JRO03C/I9300XXDLIB:user/release-keys" PRIVATE_BUILD_DESC="m0xx-user 4.1.1 JRO03C I9300XXDLIB release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=t03gxx TARGET_DEVICE=t03g BUILD_FINGERPRINT="samsung/t03gxx/t03g:4.1.1/JRO03C/N7100XXALJ3:user/release-keys" PRIVATE_BUILD_DESC="t03gxx-user 4.1.1 JRO03C N7100XXALJ3 release-keys"
diff --git a/full_i9300.mk b/full_n7100.mk
similarity index 90%
rename from full_i9300.mk
rename to full_n7100.mk
index d56ad457..39053cc8 100644
--- a/full_i9300.mk
+++ b/full_n7100.mk
@@ -25,11 +25,11 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 # This is where we'd set a backup provider if we had one
 #$(call inherit-product, device/sample/products/backup_overlay.mk)
-$(call inherit-product, device/samsung/i9300/i9300.mk)
+$(call inherit-product, device/samsung/n7100/n7100.mk)
 
 # Discard inherited values and use our own instead.
-PRODUCT_NAME := full_i9300
-PRODUCT_DEVICE := i9300
+PRODUCT_NAME := full_n7100
+PRODUCT_DEVICE := n7100
 PRODUCT_BRAND := samsung
 PRODUCT_MANUFACTURER := samsung
-PRODUCT_MODEL := GT-I9300
+PRODUCT_MODEL := GT-N7100
diff --git a/i9300.mk b/n7100.mk
similarity index 98%
rename from i9300.mk
rename to n7100.mk
index 07d1df3e..7766fce6 100644
--- a/i9300.mk
+++ b/n7100.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-LOCAL_PATH := device/samsung/i9300
+LOCAL_PATH := device/samsung/n7100
 
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 
@@ -214,4 +214,4 @@ TARGET_OMX_PATH := hardware/samsung/exynos/multimedia/openmax
 $(call inherit-product, hardware/samsung/exynos4x12.mk)
 $(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
 
-$(call inherit-product-if-exists, vendor/samsung/i9300/i9300-vendor.mk)
+$(call inherit-product-if-exists, vendor/samsung/n7100/n7100-vendor.mk)
diff --git a/proprietary-files.sh b/proprietary-files.sh
index 24bafe62..651f9b36 100644
--- a/proprietary-files.sh
+++ b/proprietary-files.sh
@@ -17,7 +17,7 @@
 # This file is generated by device/common/generate-blob-scripts.sh - DO NOT EDIT
 
 MANUFACTURER=samsung
-DEVICE=i9300
+DEVICE=n7100
 
 mkdir -p ../../../vendor/$MANUFACTURER/$DEVICE/proprietary
 
@@ -154,8 +154,7 @@ adb pull /system/vendor/firmware/setfile.bin ../../../vendor/$MANUFACTURER/$DEVI
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-LOCAL_PATH := vendor/samsung/i9300
-
+LOCAL_PATH := vendor/samsung/n7100
 PRODUCT_PACKAGES += \\
     libTVOut \\
     libUMP \\
@@ -319,7 +318,7 @@ EOF
 
 LOCAL_PATH := \$(call my-dir)
 
-ifneq (\$(filter i9300,\$(TARGET_DEVICE)),)
+ifneq (\$(filter n7100,\$(TARGET_DEVICE)),)
 
 include \$(CLEAR_VARS)
 LOCAL_MODULE := libTVOut