Renaming Session/OptionSet => Poll/Template