rename and fix compile error