Refactoring / Renaming / Namespacing.