diff --git a/README.md b/README.md
index ae5ab6c..29162c1 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ On a UEFI system ensure these conditions are met. See [How to prep](#how-to-prep
 
 - One GPT-partitioned disk
 - Arch Linux live CD ISO image sees exactly one partition with partition type code `BF00` ("Solaris root")
-- Arch Linux live CD ISO image sees exactly one partition with partition type code `EF00` ("EFI system partition")
+- Arch Linux live CD ISO image sees exactly one partition with partition type code `EF00` ("EFI System Partition")
 - The `EF00` EFI partition is mountable, in practical terms this usually only means it has a file system.
 - No ZFS zpool exists
 
@@ -45,7 +45,7 @@ mkfs.vfat /dev/sda1
 >
 > `--new '2'`: Create partition number `2`. Both field number 2, the start sector, and field number 3, the end sector, are unspecified, there's no field separator `:`. Field number 2 will be the first free sector - in this case right after partition 1 - and field number 3 will be end of disk. Thus partition `2` will fill the remaining free disk space.
 >
-> `--typecode '1:EF00'`: Partition 1 gets partition type code `EF00`, an EFI system partition.
+> `--typecode '1:EF00'`: Partition 1 gets partition type code `EF00`, an EFI System Partition.
 >
 > `--typecode '2:BF00'`: Partition 2 gets partition type code `BF00`, a Solaris root partition.
 
@@ -513,7 +513,7 @@ Explanation:
     zpool/root            none        off       no
     zpool/root/archlinux  /mnt        noauto    yes <-- Now mounted
     ```
-- We lastly mount our EFI system partition (ESP), in this example it's living at `/dev/sda1` so adjust this path accordingly.
+- We lastly mount our EFI System Partition (ESP), in this example it's living at `/dev/sda1` so adjust this path accordingly.
 
     ```
     # df -hTP
diff --git a/setup.sh b/setup.sh
index 6db8018..03dde5d 100644
--- a/setup.sh
+++ b/setup.sh
@@ -220,7 +220,7 @@ function select_part () {
     if [[ ! "${parts}" ]]; then
         case "${part_type}" in
             efi)
-                part_type_human_readable='EFI system partition (ESP) with partition type code EF00'
+                part_type_human_readable='EFI System Partition (ESP) with partition type code EF00'
                 ;;
             zfs)
                 if [[ "${part_schema}" = 'mbr' ]]; then