file names cleanup