Consistent names for focusing on annotations
Merge pull request #1733 from hypothesis/consistent-naming

Consistent names for focusing on annotations.