Renaming/Refactoring for PSR-4