RF/BF: Finish renaming, update default event names