Update to match the new crate_name semantics
Update for the recent to_str() -> to_string() change, and stop using to_str_radix