Unify file naming