Renamed files to match naming conventions