Filename cleanup