[#7] renames and comments