File name cleanup