Rename the ExtraFormGenerator to ExtraFormBuilder