Fixed references to old 'Core' NS