Renamed files in according with our file naming convention