Stream component naming simplification