Better handling of crate name.