Renamed a file and fixed a mis-commit.