better naming of some files