Fixing naming collision