new name, minor refinements