Gabe fixes
Rename flag variables