Propagate recent RFC for naming conventions

[alexcrichton]

Tracking issue for rust-lang/rfcs#344

[alexcrichton]

I believe this has largely been done, and the stragglers are going to show up during stabilization.