Rename some traits to be less stupid.