rename and improve doc comment