Class name and namespace refactoring.