More renames so that the teacher can run his script and not complain