Refactored more possible naming collisions.