Filenames and MASTER refactoring'