Remove naming diversity