change some member names

This changes the names of some members of pattern manager to make them clearer.
This is based on our previous discussion.