Renaming some files to be more clear