Migrate to PEAR-like class names