Forms: rename discard -> omit