Renamed a couple of files for better consistency