namespace refactor, fix group prefixes