clean up class/prototype nomenclature