Rename confusing file names