Cleaning up.

Renaming a couple files.