Use new appName/streamName methodology