Renamed Files

Renamed files to fit with the naming convention