Renamed files to match style