And a couple of other naming tweaks Related to https://github.com/rust-lang/rust/issues/48054
unicode-rs