Clean up some ids to be more consistent