Fix add/remove bootoptions with new kernel/initrd names