Fixed name issues between database and namespace