rustup

Renamings and minor deprecations.