Fixed FlagService var names and docblocks.