Renamed files and objects for consistency