Update Config to be proerly namespaced