PSR-0 renaming