Fix names in Nitor space