Form Rename and some todos