Remove naming collision