A temporary workaround could be to rename them to Raw*, and then we can fix the utility in a future PR.