Rename files; remove empty one.