Renamed some files so the file names fit the function names