Filename fix, part 1