Renamed the rest of the files as well.
Fixed the previous commit.