Renaming files and fixing naming issues