Fix to core namespace.