rename and fix helpers