Renamed some files so that they matches the same style