make sure the form name is used, not the panel one also clean-up the api, so it's only mentioned once for both handlers fix #2461