Renamed files to be consistent and clear