Fixed naming collisions.