Rename and extend reset helper