Bootloader definitions now matching for RPC's