updated namespace
edited names in config
edited names in config