Better naming handling