Ok.. lets do that. I'll rename as part of this pull requests. Lets take the distinctions when there's an explicit need for them.