Renamed flag variable names