Renamed files to be consistent with the rest