rename and comment changes