Addressing naming collisions, and refactoring