Change CJK encoding aliases to their most popular variation of

hyphen and underscores in consistency of non-CJK aliases.
(Spotted by Mike Brown at SF #969415)