another batch of name fixes