diff --git a/packages/angular-sdk-components/src/lib/_components/infra/Containers/flow-container/flow-container.component.ts b/packages/angular-sdk-components/src/lib/_components/infra/Containers/flow-container/flow-container.component.ts
index 5ffc4cf3..2879fb6c 100644
--- a/packages/angular-sdk-components/src/lib/_components/infra/Containers/flow-container/flow-container.component.ts
+++ b/packages/angular-sdk-components/src/lib/_components/infra/Containers/flow-container/flow-container.component.ts
@@ -11,9 +11,8 @@ import { ComponentMapperComponent } from '../../../../_bridge/component-mapper/c
 import { FlowContainerBaseComponent } from '../base-components/flow-container-base.component';
 
 /**
- * WARNING:  It is not expected that this file should be modified.  It is part of infrastructure code that works with
- * Redux and creation/update of Redux containers and PConnect.  Modifying this code could have undesireable results and
- * is totally at your own risk.
+ * WARNING: This file is part of the infrastructure component responsible for working with Redux and managing the creation and update of Redux containers and PConnect.
+ * You may override Material components within this component if needed, but do not modify any container-related logic. Changing this logic can lead to unexpected behavior.
  */
 
 interface FlowContainerProps {
diff --git a/packages/angular-sdk-components/src/lib/_components/infra/Containers/hybrid-view-container/hybrid-view-container.component.ts b/packages/angular-sdk-components/src/lib/_components/infra/Containers/hybrid-view-container/hybrid-view-container.component.ts
index 8cb9029d..668cd313 100644
--- a/packages/angular-sdk-components/src/lib/_components/infra/Containers/hybrid-view-container/hybrid-view-container.component.ts
+++ b/packages/angular-sdk-components/src/lib/_components/infra/Containers/hybrid-view-container/hybrid-view-container.component.ts
@@ -3,9 +3,8 @@ import { CommonModule } from '@angular/common';
 import { FormGroup } from '@angular/forms';
 
 /**
- * WARNING:  It is not expected that this file should be modified.  It is part of infrastructure code that works with
- * Redux and creation/update of Redux containers and PConnect.  Modifying this code could have undesireable results and
- * is totally at your own risk.
+ * WARNING: This file is part of the infrastructure component responsible for working with Redux and managing the creation and update of Redux containers and PConnect.
+ * You may override Material components within this component if needed, but do not modify any container-related logic. Changing this logic can lead to unexpected behavior.
  */
 
 // Right this is a skeleton, as Hybrid ViewContainer hasn't been implemented
diff --git a/packages/angular-sdk-components/src/lib/_components/infra/Containers/modal-view-container/modal-view-container.component.ts b/packages/angular-sdk-components/src/lib/_components/infra/Containers/modal-view-container/modal-view-container.component.ts
index 65d315bd..090f5504 100644
--- a/packages/angular-sdk-components/src/lib/_components/infra/Containers/modal-view-container/modal-view-container.component.ts
+++ b/packages/angular-sdk-components/src/lib/_components/infra/Containers/modal-view-container/modal-view-container.component.ts
@@ -9,9 +9,8 @@ import { getBanners } from '../../../../_helpers/case-utils';
 import { ReferenceComponent } from '../../reference/reference.component';
 
 /**
- * WARNING:  It is not expected that this file should be modified.  It is part of infrastructure code that works with
- * Redux and creation/update of Redux containers and PConnect.  Modifying this code could have undesireable results and
- * is totally at your own risk.
+ * WARNING: This file is part of the infrastructure component responsible for working with Redux and managing the creation and update of Redux containers and PConnect.
+ * You may override Material components within this component if needed, but do not modify any container-related logic. Changing this logic can lead to unexpected behavior.
  */
 
 @Component({
diff --git a/packages/angular-sdk-components/src/lib/_components/infra/Containers/preview-view-container/preview-view-container.component.ts b/packages/angular-sdk-components/src/lib/_components/infra/Containers/preview-view-container/preview-view-container.component.ts
index f839c703..ba2d7b9d 100644
--- a/packages/angular-sdk-components/src/lib/_components/infra/Containers/preview-view-container/preview-view-container.component.ts
+++ b/packages/angular-sdk-components/src/lib/_components/infra/Containers/preview-view-container/preview-view-container.component.ts
@@ -1,9 +1,8 @@
 import { Component, OnInit, Input } from '@angular/core';
 
 /**
- * WARNING:  It is not expected that this file should be modified.  It is part of infrastructure code that works with
- * Redux and creation/update of Redux containers and PConnect.  Modifying this code could have undesireable results and
- * is totally at your own risk.
+ * WARNING: This file is part of the infrastructure component responsible for working with Redux and managing the creation and update of Redux containers and PConnect.
+ * You may override Material components within this component if needed, but do not modify any container-related logic. Changing this logic can lead to unexpected behavior.
  */
 
 // Right this is a skeleton, as Preview hasn't been implemented
diff --git a/packages/angular-sdk-components/src/lib/_components/infra/Containers/view-container/view-container.component.ts b/packages/angular-sdk-components/src/lib/_components/infra/Containers/view-container/view-container.component.ts
index 50ad8525..16ddf8c6 100644
--- a/packages/angular-sdk-components/src/lib/_components/infra/Containers/view-container/view-container.component.ts
+++ b/packages/angular-sdk-components/src/lib/_components/infra/Containers/view-container/view-container.component.ts
@@ -8,9 +8,8 @@ import { ComponentMapperComponent } from '../../../../_bridge/component-mapper/c
 import { configureBrowserBookmark } from './helper';
 
 /**
- * WARNING:  It is not expected that this file should be modified.  It is part of infrastructure code that works with
- * Redux and creation/update of Redux containers and PConnect.  Modifying this code could have undesireable results and
- * is totally at your own risk.
+ * WARNING: This file is part of the infrastructure component responsible for working with Redux and managing the creation and update of Redux containers and PConnect.
+ * You may override Material components within this component if needed, but do not modify any container-related logic. Changing this logic can lead to unexpected behavior.
  */
 
 interface ViewContainerProps {
diff --git a/packages/angular-sdk-components/src/lib/_components/infra/defer-load/defer-load.component.ts b/packages/angular-sdk-components/src/lib/_components/infra/defer-load/defer-load.component.ts
index b34e1539..1351ee7e 100644
--- a/packages/angular-sdk-components/src/lib/_components/infra/defer-load/defer-load.component.ts
+++ b/packages/angular-sdk-components/src/lib/_components/infra/defer-load/defer-load.component.ts
@@ -6,9 +6,8 @@ import { ComponentMapperComponent } from '../../../_bridge/component-mapper/comp
 import { AngularPConnectData, AngularPConnectService } from '../../../_bridge/angular-pconnect';
 
 /**
- * WARNING:  It is not expected that this file should be modified.  It is part of infrastructure code that works with
- * Redux and creation/update of Redux containers and PConnect.  Modifying this code could have undesireable results and
- * is totally at your own risk.
+ * WARNING: This file is part of the infrastructure component responsible for working with Redux and managing the creation and update of Redux containers and PConnect.
+ * You may override Material components within this component if needed, but do not modify any container-related logic. Changing this logic can lead to unexpected behavior.
  */
 
 @Component({
diff --git a/packages/angular-sdk-components/src/lib/_components/infra/reference/reference.component.ts b/packages/angular-sdk-components/src/lib/_components/infra/reference/reference.component.ts
index 3943988c..e14a7636 100644
--- a/packages/angular-sdk-components/src/lib/_components/infra/reference/reference.component.ts
+++ b/packages/angular-sdk-components/src/lib/_components/infra/reference/reference.component.ts
@@ -1,9 +1,8 @@
 import { Component } from '@angular/core';
 
 /**
- * WARNING: It is not expected that this file should be modified.  It is part of infrastructure code that works with
- * Redux and creation/update of Redux containers and PConnect.  Modifying this code could have undesireable results and
- * is totally at your own risk.
+ * WARNING: This file is part of the infrastructure component responsible for working with Redux and managing the creation and update of Redux containers and PConnect.
+ * You may override Material components within this component if needed, but do not modify any container-related logic. Changing this logic can lead to unexpected behavior.
  */
 
 @Component({
diff --git a/packages/angular-sdk-components/src/lib/_components/infra/root-container/root-container.component.ts b/packages/angular-sdk-components/src/lib/_components/infra/root-container/root-container.component.ts
index f3f4773b..9068edcc 100644
--- a/packages/angular-sdk-components/src/lib/_components/infra/root-container/root-container.component.ts
+++ b/packages/angular-sdk-components/src/lib/_components/infra/root-container/root-container.component.ts
@@ -11,9 +11,8 @@ import { ModalViewContainerComponent } from '../Containers/modal-view-container/
 import { ComponentMapperComponent } from '../../../_bridge/component-mapper/component-mapper.component';
 
 /**
- * WARNING:  It is not expected that this file should be modified.  It is part of infrastructure code that works with
- * Redux and creation/update of Redux containers and PConnect.  Modifying this code could have undesireable results and
- * is totally at your own risk.
+ * WARNING: This file is part of the infrastructure component responsible for working with Redux and managing the creation and update of Redux containers and PConnect.
+ * You may override Material components within this component if needed, but do not modify any container-related logic. Changing this logic can lead to unexpected behavior.
  */
 
 const options = { context: 'app' };
diff --git a/packages/angular-sdk-components/src/lib/_components/infra/view/view.component.ts b/packages/angular-sdk-components/src/lib/_components/infra/view/view.component.ts
index c43848a0..64592816 100644
--- a/packages/angular-sdk-components/src/lib/_components/infra/view/view.component.ts
+++ b/packages/angular-sdk-components/src/lib/_components/infra/view/view.component.ts
@@ -24,9 +24,8 @@ function isDetailsTemplate(template) {
 }
 
 /**
- * WARNING:  It is not expected that this file should be modified.  It is part of infrastructure code that works with
- * Redux and creation/update of Redux containers and PConnect.  Modifying this code could have undesireable results and
- * is totally at your own risk.
+ * WARNING: This file is part of the infrastructure component responsible for working with Redux and managing the creation and update of Redux containers and PConnect.
+ * You may override Material components within this component if needed, but do not modify any container-related logic. Changing this logic can lead to unexpected behavior.
  */
 
 /**