Another round of renaming files.

Leaving them alphabetized.