Changed namespacing, added namespace alias