diff --git a/device/device-samsung-i9505/90-android-sec_touchscreen.rules b/device/device-samsung-jflte/90-android-sec_touchscreen.rules
similarity index 100%
rename from device/device-samsung-i9505/90-android-sec_touchscreen.rules
rename to device/device-samsung-jflte/90-android-sec_touchscreen.rules
diff --git a/device/device-samsung-i9505/APKBUILD b/device/device-samsung-jflte/APKBUILD
similarity index 64%
rename from device/device-samsung-i9505/APKBUILD
rename to device/device-samsung-jflte/APKBUILD
index f3c002346..27abc8a89 100644
--- a/device/device-samsung-i9505/APKBUILD
+++ b/device/device-samsung-jflte/APKBUILD
@@ -1,12 +1,12 @@
-pkgname="device-samsung-i9505"
-pkgdesc="Samsung Galaxy S4 International"
-pkgver=0.4
-pkgrel=5
+pkgname="device-samsung-jflte"
+pkgdesc="Samsung Galaxy S4"
+pkgver=0.5
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
-depends="postmarketos-base linux-samsung-i9505 mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-samsung-jflte mkbootimg mesa-dri-swrast"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo 90-android-sec_touchscreen.rules"
 
@@ -19,9 +19,9 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="Wifi firmware"
-	depends="firmware-samsung-i9505"
+	depends="firmware-samsung-jflte"
 	mkdir "$subpkgdir"
 }
 
-sha512sums="1045a64b14ba22b9dafe8c31caf4ae5cd72f55ad26cdf4cf3d986062fecf5728e13e7dacccf47cdcadfe83c50f478d7df5425ad6610b12c035b5ebdf5a5a356e  deviceinfo
+sha512sums="2ccb9da9d69f30e62d69ecb89939da5ddd25625b9e8ecdd9a41fa7bc5dfbdda415043b2b6e98587936740300cdb17ada1e2255ce39e54b0281e8ea48739b4332  deviceinfo
 9dd220de9aa0ee4106686d43a4bac858c7b57ca8537488a54176ef13615195dab7945ca3f6896368186e99c7ed78748a2ad25458efe586dbc337190143d5184f  90-android-sec_touchscreen.rules"
diff --git a/device/device-samsung-i9505/deviceinfo b/device/device-samsung-jflte/deviceinfo
similarity index 95%
rename from device/device-samsung-i9505/deviceinfo
rename to device/device-samsung-jflte/deviceinfo
index f76ba20b6..22fe48f08 100644
--- a/device/device-samsung-i9505/deviceinfo
+++ b/device/device-samsung-jflte/deviceinfo
@@ -2,7 +2,7 @@
 # Please use double quotes only. You can source this file in shell scripts.
 
 deviceinfo_format_version="0"
-deviceinfo_name="Samsung Galaxy S4 International"
+deviceinfo_name="Samsung Galaxy S4"
 deviceinfo_manufacturer="Samsung"
 deviceinfo_date=""
 deviceinfo_dtb=""
diff --git a/device/linux-samsung-i9505/00_fix_return_address.patch b/device/linux-samsung-jflte/00_fix_return_address.patch
similarity index 100%
rename from device/linux-samsung-i9505/00_fix_return_address.patch
rename to device/linux-samsung-jflte/00_fix_return_address.patch
diff --git a/device/linux-samsung-i9505/01_msm-fix-perf_trace_counters.patch b/device/linux-samsung-jflte/01_msm-fix-perf_trace_counters.patch
similarity index 100%
rename from device/linux-samsung-i9505/01_msm-fix-perf_trace_counters.patch
rename to device/linux-samsung-jflte/01_msm-fix-perf_trace_counters.patch
diff --git a/device/linux-samsung-i9505/02_gpu-msm-fix-gcc5-compile.patch b/device/linux-samsung-jflte/02_gpu-msm-fix-gcc5-compile.patch
similarity index 100%
rename from device/linux-samsung-i9505/02_gpu-msm-fix-gcc5-compile.patch
rename to device/linux-samsung-jflte/02_gpu-msm-fix-gcc5-compile.patch
diff --git a/device/linux-samsung-i9505/03-fix-video-argb-setting.patch b/device/linux-samsung-jflte/03-fix-video-argb-setting.patch
similarity index 100%
rename from device/linux-samsung-i9505/03-fix-video-argb-setting.patch
rename to device/linux-samsung-jflte/03-fix-video-argb-setting.patch
diff --git a/device/linux-samsung-i9505/APKBUILD b/device/linux-samsung-jflte/APKBUILD
similarity index 93%
rename from device/linux-samsung-i9505/APKBUILD
rename to device/linux-samsung-jflte/APKBUILD
index c778b57f9..a29a1f6ba 100644
--- a/device/linux-samsung-i9505/APKBUILD
+++ b/device/linux-samsung-jflte/APKBUILD
@@ -1,12 +1,12 @@
 # Kernel config based on: arch/arm/configs/jf_defconfig
 
-pkgname="linux-samsung-i9505"
+pkgname="linux-samsung-jflte"
 pkgver=3.4.112
-pkgrel=3
-pkgdesc="Samsung Galaxy S4 International kernel fork"
+pkgrel=4
+pkgdesc="Samsung Galaxy S4 kernel fork"
 arch="armhf"
 _carch="arm"
-_flavor="samsung-i9505"
+_flavor="samsung-jflte"
 url="https://kernel.org"
 license="GPL2"
 options="!strip !check !tracedeps"
@@ -74,8 +74,8 @@ package() {
 	fi
 }
 
-sha512sums="7b73724636d9fb2a19e6405b1c6acd9f08020cb2d8c51f209eab2dea90616f15e88e96cdea62931864a6a3f6d4ad1c0b0b9b5cae3e3a690c20f5a9dcb4b33d82  linux-samsung-i9505-e8d93e03563e42d7c762d4e9a87d77115102b301.tar.gz
-db5954f282c568fd635df81f463712849571c0148233dd883c80cf42ad7b948dd42247032d513e600e4952d58a44fb76f57e1b7bc9502be9698a164c3933c0c5  config-samsung-i9505.armhf
+sha512sums="7b73724636d9fb2a19e6405b1c6acd9f08020cb2d8c51f209eab2dea90616f15e88e96cdea62931864a6a3f6d4ad1c0b0b9b5cae3e3a690c20f5a9dcb4b33d82  linux-samsung-jflte-e8d93e03563e42d7c762d4e9a87d77115102b301.tar.gz
+db5954f282c568fd635df81f463712849571c0148233dd883c80cf42ad7b948dd42247032d513e600e4952d58a44fb76f57e1b7bc9502be9698a164c3933c0c5  config-samsung-jflte.armhf
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
 ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  00_fix_return_address.patch
 36418ec3d31d1d6d9915afcf3d38d4549aeeb49c3825414b51b67db7a1ab6482f22d2723da3b258b671956809949278a51f6507df9b0052aec0bd0c59f56919a  patch_lifebook_detect.patch
diff --git a/device/linux-samsung-i9505/compiler-gcc6.h b/device/linux-samsung-jflte/compiler-gcc6.h
similarity index 100%
rename from device/linux-samsung-i9505/compiler-gcc6.h
rename to device/linux-samsung-jflte/compiler-gcc6.h
diff --git a/device/linux-samsung-i9505/config-samsung-i9505.armhf b/device/linux-samsung-jflte/config-samsung-jflte.armhf
similarity index 100%
rename from device/linux-samsung-i9505/config-samsung-i9505.armhf
rename to device/linux-samsung-jflte/config-samsung-jflte.armhf
diff --git a/device/linux-samsung-i9505/gpu_msm2_fix_compile.patch b/device/linux-samsung-jflte/gpu_msm2_fix_compile.patch
similarity index 100%
rename from device/linux-samsung-i9505/gpu_msm2_fix_compile.patch
rename to device/linux-samsung-jflte/gpu_msm2_fix_compile.patch
diff --git a/device/linux-samsung-i9505/patch_fsp_detect.patch b/device/linux-samsung-jflte/patch_fsp_detect.patch
similarity index 100%
rename from device/linux-samsung-i9505/patch_fsp_detect.patch
rename to device/linux-samsung-jflte/patch_fsp_detect.patch
diff --git a/device/linux-samsung-i9505/patch_lifebook_detect.patch b/device/linux-samsung-jflte/patch_lifebook_detect.patch
similarity index 100%
rename from device/linux-samsung-i9505/patch_lifebook_detect.patch
rename to device/linux-samsung-jflte/patch_lifebook_detect.patch
diff --git a/firmware/firmware-samsung-i9505/APKBUILD b/firmware/firmware-samsung-jflte/APKBUILD
similarity index 81%
rename from firmware/firmware-samsung-i9505/APKBUILD
rename to firmware/firmware-samsung-jflte/APKBUILD
index b62ac06ea..20b2d882b 100644
--- a/firmware/firmware-samsung-i9505/APKBUILD
+++ b/firmware/firmware-samsung-jflte/APKBUILD
@@ -1,7 +1,7 @@
-pkgname=firmware-samsung-i9505
-pkgver=1
+pkgname=firmware-samsung-jflte
+pkgver=1.1
 pkgrel=0
-pkgdesc="Samsung Galaxy S4 International Firmware"
+pkgdesc="Samsung Galaxy S4 Firmware"
 url="https://github.com/flo071/proprietary_vendor_samsung_jf-common"
 arch="noarch"
 license="proprietary"
@@ -20,4 +20,4 @@ package() {
 	install -Dm644 "etc/wifi/nvram_net.txt" \
 		"$pkgdir/lib/firmware/postmarketos/nvram_net.txt"
 }
-sha512sums="b8b92806123b4ab5c02adfb1e33ad18a84a51f181485f7fffe51a6d60678b9750c3bc461550b0a3afde99b4685c8720b0b8be3626f68a284863cb10e3c68c7c5  firmware-samsung-i9505-af95c8f4af9fda8b909579dafc30ec1ce29cb12d.tar.gz"
+sha512sums="b8b92806123b4ab5c02adfb1e33ad18a84a51f181485f7fffe51a6d60678b9750c3bc461550b0a3afde99b4685c8720b0b8be3626f68a284863cb10e3c68c7c5  firmware-samsung-jflte-af95c8f4af9fda8b909579dafc30ec1ce29cb12d.tar.gz"