Rename some variables to end with Psr0
Add a 'smarter' implementation for PSR-4.