Rename a method.
Add timeout logic to poll/select integration stuff.