Fixed PSR-0 naming