Fixed naming collisions