rename and minor fix