rename and comment