In any function that previously only took a PTS ID, use NameOrId to