Rename poll to wait and clean up interfaces.

Change-Id: I68f879006f6846c3970e63e4a74b4a82ecfb562f