Changed namespacing to be more consistent