resolves STREAMS-167
resolves STREAMS-167
naming consistency