more name changes, to be compatible with npm