Renamed files and functions