Migrated to PEAR-style naming