Refactor namespace and class names