MOD: refine file names