#15 autofix form name issues