Renamed flag variable names, closes #35