Remove PEAR style class name and replace with PSR-0 compliant