Revert "Renamed some files."

This reverts commit 834126dc8d5d8a56d542a2eab2607e5841974947.
Minor changes.