rename and fix bug