Great renaming: propagate throughout the rest of the codebase
Fix merge fallout
Warning cleanup
auto merge of #7468 : cmr/rust/great_renaming, r=pcwalton