diff --git a/universal7885-common/rootdir/Android.bp b/universal7885-common/rootdir/Android.bp
index 2628100..e80c27d 100644
--- a/universal7885-common/rootdir/Android.bp
+++ b/universal7885-common/rootdir/Android.bp
@@ -41,13 +41,13 @@ prebuilt_etc {
 
 prebuilt_etc {
     name: "fstab.exynos7884B",
-    src: "etc/fstab.exynos7884B",
+    src: "etc/fstab.exynos7885",
     vendor: true,
 }
 
 prebuilt_etc {
     name: "fstab.exynos7904",
-    src: "etc/fstab.exynos7904",
+    src: "etc/fstab.exynos7885",
     vendor: true,
 }
 
diff --git a/universal7885-common/rootdir/etc/fstab.exynos7884B b/universal7885-common/rootdir/etc/fstab.exynos7885
similarity index 100%
rename from universal7885-common/rootdir/etc/fstab.exynos7884B
rename to universal7885-common/rootdir/etc/fstab.exynos7885
diff --git a/universal7885-common/rootdir/etc/fstab.exynos7904 b/universal7885-common/rootdir/etc/fstab.exynos7904
deleted file mode 100644
index f5f4d9d..0000000
--- a/universal7885-common/rootdir/etc/fstab.exynos7904
+++ /dev/null
@@ -1,23 +0,0 @@
-# Android fstab file.
-#<src>                  <mnt_point>         <type>    <mnt_flags and options>                               <fs_mgr_flags>
-# The filesystem that contains the filesystem checker binary (typically /system) cannot
-# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
-
-/dev/block/platform/13500000.dwmmc0/by-name/cache      /cache  ext4   nosuid,nodev,noatime,barrier=1                   wait
-/dev/block/platform/13500000.dwmmc0/by-name/cache      /cache   f2fs   nosuid,nodev,noatime,inline_xattr,flush_merge,data_flush   wait
-/dev/block/platform/13500000.dwmmc0/by-name/userdata	/data	ext4	nosuid,nodev,barrier=1,noauto_da_alloc,discard,noatime,lazytime   wait,check,reservedsize=128M
-/dev/block/platform/13500000.dwmmc0/by-name/userdata   /data    f2fs     nosuid,nodev,discard,noatime,lazytime,data_flush    wait,check
-/dev/block/platform/13500000.dwmmc0/by-name/efs	/mnt/vendor/efs	ext4	noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic	wait,check
-/dev/block/platform/13500000.dwmmc0/by-name/misc	/misc	emmc      defaults  defaults
-/dev/block/platform/13500000.dwmmc0/by-name/omr            /metadata       ext4    noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic wait,first_stage_mount,formattable,check
-
-# Erofs support (Override DTBO fstab)
-/dev/block/platform/13500000.dwmmc0/by-name/system       /system         ext4    ro   wait,first_stage_mount
-/dev/block/platform/13500000.dwmmc0/by-name/system       /system         erofs   ro   wait,first_stage_mount
-/dev/block/platform/13500000.dwmmc0/by-name/vendor       /vendor         ext4    ro   wait,first_stage_mount
-/dev/block/platform/13500000.dwmmc0/by-name/vendor       /vendor         erofs   ro   wait,first_stage_mount
-
-# VOLD :: fstab.a20e
-/dev/block/platform/13500000.dwmmc0/by-name/hidden	/preload	ext4	noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic	voldmanaged=preload:auto,check
-/devices/platform/13550000.dwmmc2/mmc_host/mmc1*        auto        vfat    defaults    voldmanaged=sdcard:auto
-/devices/platform/13600000.usb/13600000.dwc3*		auto        auto    defaults    voldmanaged=usb:auto