Renamed files for more consistency.