Renaming and new poll class