Fix rustpkg renaming
Revert rustpkg; fix rustdoc