Renamed files according to conventions