Renamed files to convention