Normalize some naming, implement --modify verb.