diff --git a/src/generator.h b/src/generator.h
index d9dae5b..44d0d29 100755
--- a/src/generator.h
+++ b/src/generator.h
@@ -117,18 +117,18 @@ private:
 	// if we are printing only to one stream e.g. [put stream "3"]
 	// then output_stream is pointing directly to that stream 
 	// but if we are printing to more than one stream e.g. [put stream "0" "2" "5"]
-	// then output_stream is pointing to tmp_stream and at the end
-	// tmp_stream is copied to the correct streams
+	// then output_stream is pointing to output_tmp_stream and at the end
+	// output_tmp_stream is copied to the correct streams
 	// output_stream can be null e.g. [put stream] without arguments
 	// in such a case we do not print anything
 	StreamType * output_stream;
 	Pattern    * pattern;
 	Functions<StreamType> * functions;
 
-	// tmp_stream is used when outputting to more than one stream
-	// (first we output to tmp_stream and then the content is copied
+	// output_tmp_stream is used when outputting to more than one stream
+	// (first we output to output_tmp_stream and then the content is copied
 	// to the correct streams)
-	StreamType tmp_stream;
+	StreamType output_tmp_stream;
 
 	// pointers to the output streams
 	std::vector<StreamType*> output_stream_tab;
@@ -538,7 +538,7 @@ void Generator<StreamType>::Generate(Pattern * p, Functions<StreamType> * f)
 
 	output_stream = 0;
 	output_stream_index.clear();
-	ClearStream(tmp_stream);
+	ClearStream(output_tmp_stream);
 
 	if( !output_stream_tab.empty() )
 	{
@@ -936,9 +936,9 @@ template<class StreamType>
 void Generator<StreamType>::WriteTmpStreamToStreams()
 {
 	#ifdef EZC_HAS_SPECIAL_STREAM
-		const std::wstring & str = tmp_stream.Str();
+		const std::wstring & str = output_tmp_stream.Str();
 	#else
-		const std::wstring & str = tmp_stream.str();
+		const std::wstring & str = output_tmp_stream.str();
 	#endif
 
 	if( !str.empty() )
@@ -951,7 +951,7 @@ void Generator<StreamType>::WriteTmpStreamToStreams()
 				output_stream_tab[i]->write(str.c_str(), str.size());
 		}
 
-		ClearStream(tmp_stream);
+		ClearStream(output_tmp_stream);
 	}
 }
 
@@ -1459,8 +1459,8 @@ void Generator<StreamType>::MakeEzcStream(Item::Function & fun)
 
 	if( output_stream_index.size() > 1 )
 	{
-		ClearStream(tmp_stream);
-		output_stream = &tmp_stream;
+		ClearStream(output_tmp_stream);
+		output_stream = &output_tmp_stream;
 	}
 	else
 	if( output_stream_index.size() == 1 )