Reflect interim renamings and typo repairs.