unify naming of some files