refactor: remove namespaces, change method names