Namefixes and changes to how we named some IDs