Experimenting with some names
More renaming. trying to keep consistent with Flags API