Appropriately renamed a few files.