Further cleaned up flag and revised naming