Refactoring names of files, urls