Rename some classes of the poll api. Clean up the poll api.