More Renamings

#423

See the full commit messages, they include the `sed` commands used to produce the commits.