When you rebase to #648 please consider changing the name of these IDs.