Clean up flag name variable in generator