File name refactoring