Renaming some variables, files etc