Thank you ValkyrieStar for an excellent guide!
I skipped "Updating other OpROMs (optional)".
My setup works without major issues
- ASUS MAXIMUS VI HERO - ATX / Z87
- ASUS Hyper M.2 x4 Mini
- Samsung 960 PRO Series
Note: The bootloader name displays correct but the 960 does not appear with correct name in the UEFI bios.