Renamed files and updated the tests.