To switch to using grub2-efi…
sudo editor /etc/sysconfig/bootloader
Change LOADER_TYPE to LOADER_TYPE="grub2-efi"
then save and exit when done.
Reinitialize the bootloader…
sudo update-bootloader --install --config
This will regenerate /boot/grub2/grub.cfg and classic GRUB menu entries will now be used instead of the BLS fragments in /boot/loader/entries/.
At this point you can clean up /boot/loader/entries if desired…
sudo rm -r /boot/loader/entries/*