Form field class name fixes