Fixed keys for help/version flags.
Update name split.