Changed namespaces again. Fixed configurations