Changed namespacing for core components