name simplification; code update in chapter