Fix form name
Fix BC break
Fix bad namespace