diff --git a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinator.swift b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinator.swift
index 92264ce19..720ed34f4 100644
--- a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinator.swift
+++ b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinator.swift
@@ -68,11 +68,11 @@ final class FlowTemplateCoordinator: FlowTemplateCoordinatorType {
 
 // MARK: - TemplateScreenCoordinatorDelegate
 extension FlowTemplateCoordinator: TemplateScreenCoordinatorDelegate {
-    func templateScreenCoordinator(_ templateScreenCoordinator: TemplateScreenCoordinatorType, didCompleteWithMessage message: String) {
+    func templateScreenCoordinator(_ coordinator: TemplateScreenCoordinatorType, didCompleteWithMessage message: String) {
         self.delegate?.flowTemplateCoordinatorDidComplete(self)
     }
 
-    func templateScreenCoordinatorDidCancel(_ templateScreenCoordinator: TemplateScreenCoordinatorType) {
+    func templateScreenCoordinatorDidCancel(_ coordinator: TemplateScreenCoordinatorType) {
         self.delegate?.flowTemplateCoordinatorDidComplete(self)
     }
 }
diff --git a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorBridgePresenter.swift b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorBridgePresenter.swift
index 6d5eb3242..4e6939611 100644
--- a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorBridgePresenter.swift
+++ b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorBridgePresenter.swift
@@ -17,7 +17,7 @@
 import Foundation
 
 @objc protocol FlowTemplateCoordinatorBridgePresenterDelegate {
-    func flowTemplateCoordinatorBridgePresenterDelegateDidComplete(_ flowTemplateCoordinatorBridgePresenter: FlowTemplateCoordinatorBridgePresenter)
+    func flowTemplateCoordinatorBridgePresenterDelegateDidComplete(_ coordinatorBridgePresenter: FlowTemplateCoordinatorBridgePresenter)
 }
 
 /// FlowTemplateCoordinatorBridgePresenter enables to start FlowTemplateCoordinator from a view controller.
@@ -71,7 +71,7 @@ final class FlowTemplateCoordinatorBridgePresenter: NSObject {
 
 // MARK: - FlowTemplateCoordinatorDelegate
 extension FlowTemplateCoordinatorBridgePresenter: FlowTemplateCoordinatorDelegate {
-    func flowTemplateCoordinatorDidComplete(_ flowTemplateCoordinator: FlowTemplateCoordinatorType) {
+    func flowTemplateCoordinatorDidComplete(_ coordinator: FlowTemplateCoordinatorType) {
         self.delegate?.flowTemplateCoordinatorBridgePresenterDelegateDidComplete(self)
     }
 }
diff --git a/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinator.swift b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinator.swift
index f7c599f3a..8cd322e45 100644
--- a/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinator.swift
+++ b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinator.swift
@@ -28,7 +28,8 @@ final class TemplateScreenCoordinator: TemplateScreenCoordinatorType {
     private let templateScreenViewController: TemplateScreenViewController
     
     // MARK: Public
-    
+
+    // Must be used only internally
     var childCoordinators: [Coordinator] = []
     
     weak var delegate: TemplateScreenCoordinatorDelegate?