diff --git a/Tools/Unio Components.xctemplate/Default/___FILEBASENAME___ViewStream.swift b/Tools/Unio Components.xctemplate/Default/___FILEBASENAME___ViewStream.swift
index 00634dd..e8423ed 100644
--- a/Tools/Unio Components.xctemplate/Default/___FILEBASENAME___ViewStream.swift	
+++ b/Tools/Unio Components.xctemplate/Default/___FILEBASENAME___ViewStream.swift	
@@ -51,7 +51,6 @@ extension ___VARIABLE_productName___ViewStream {
 
     }
 
-
     static func bind(from dependency: Dependency<Input, State, Extra>, disposeBag: DisposeBag) -> Output {
 
         let state = dependency.state
diff --git a/Tools/UnioStream.xctemplate/___FILEBASENAME___Stream.swift b/Tools/UnioStream.xctemplate/___FILEBASENAME___Stream.swift
index 00634dd..9fc3031 100644
--- a/Tools/UnioStream.xctemplate/___FILEBASENAME___Stream.swift
+++ b/Tools/UnioStream.xctemplate/___FILEBASENAME___Stream.swift
@@ -4,12 +4,12 @@ import RxCocoa
 import RxSwift
 import Unio
 
-protocol ___VARIABLE_productName___ViewStreamType: AnyObject {
-    var input: InputWrapper<___VARIABLE_productName___ViewStream.Input> { get }
-    var output: OutputWrapper<___VARIABLE_productName___ViewStream.Output> { get }
+protocol ___VARIABLE_productName___StreamType: AnyObject {
+    var input: InputWrapper<___VARIABLE_productName___Stream.Input> { get }
+    var output: OutputWrapper<___VARIABLE_productName___Stream.Output> { get }
 }
 
-final class ___VARIABLE_productName___ViewStream: UnioStream<___VARIABLE_productName___ViewStream>, ___VARIABLE_productName___ViewStreamType {
+final class ___VARIABLE_productName___Stream: UnioStream<___VARIABLE_productName___Stream>, ___VARIABLE_productName___StreamType {
 
     init(extra: Extra = .init()) {
         super.init(input: Input(),
@@ -18,7 +18,7 @@ final class ___VARIABLE_productName___ViewStream: UnioStream<___VARIABLE_product
     }
 }
 
-extension ___VARIABLE_productName___ViewStream {
+extension ___VARIABLE_productName___Stream {
 
     struct Input: InputType {
 
@@ -51,7 +51,6 @@ extension ___VARIABLE_productName___ViewStream {
 
     }
 
-
     static func bind(from dependency: Dependency<Input, State, Extra>, disposeBag: DisposeBag) -> Output {
 
         let state = dependency.state