Make naming PSR-0 compliant