Name/file refactoring