Fix unfinished renaming. change order of commenter info