Updated naming conventions for PSR-4