Attempt to solve naming collision