resolves STREAMS-167
naming consistency