name changes: more modifications