diff --git a/packages/cli/templates/react/igr-es6/grid/basic/files/src/views/__path__/index.js b/packages/cli/templates/react/igr-es6/grid/basic/files/src/views/__path__/index.js
index 0d9b7559f..96d0c993a 100644
--- a/packages/cli/templates/react/igr-es6/grid/basic/files/src/views/__path__/index.js
+++ b/packages/cli/templates/react/igr-es6/grid/basic/files/src/views/__path__/index.js
@@ -22,7 +22,7 @@ export default class $(ClassName) extends Component {
 				<h1 className={style.title}>{this.title}</h1>
 				<div>
 					Read more on the&nbsp;
-                    <a href="https://www.infragistics.com/products/ignite-ui-react/react/components/grid.html">
+                    <a href="https://www.infragistics.com/products/ignite-ui-react/react/components/grids/data-grid.html">
 						official documentation page
                     </a>
 				</div>
@@ -39,15 +39,8 @@ export default class $(ClassName) extends Component {
 						<IgrDateTimeColumn field="OrderDate" headerText="Order Date" />
 					</IgrDataGrid>
 				</div>
-				<div className={style.grid}>
-					<IgrDataGrid
-						height="100%"
-						width="100%"
-						autoGenerateColumns="true"
-						dataSource={this.data} />
-				</div>
 				</div>
 			</div>
 		)
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/cli/templates/react/igr-es6/grid/index.ts b/packages/cli/templates/react/igr-es6/grid/index.ts
index 0b0f0cb6f..c0005ef4a 100644
--- a/packages/cli/templates/react/igr-es6/grid/index.ts
+++ b/packages/cli/templates/react/igr-es6/grid/index.ts
@@ -7,7 +7,7 @@ class IgrDataGridComponent extends BaseComponent {
 	constructor() {
 		super(__dirname);
 		this.name = "Data Grid";
-		this.group = "Grids & Lists";
+		this.group = "Grids";
 		this.description = "pick from grids: basic, sorting, templating.";
 	}
 }
diff --git a/packages/cli/templates/react/igr-es6/groups.json b/packages/cli/templates/react/igr-es6/groups.json
index 4d9ba21df..f55a8a30b 100644
--- a/packages/cli/templates/react/igr-es6/groups.json
+++ b/packages/cli/templates/react/igr-es6/groups.json
@@ -1,5 +1,5 @@
 {
 	"Gauges": "scale measure Controls including Linear and Radial Gauge and Bullet Graph.",
 	"Charts": "high-performance data visualization for category and financial data.",
-	"Grids & Lists": "bind and display data sets with little coding or configuration."
-}
\ No newline at end of file
+	"Grids": "bind and display data sets with little coding or configuration."
+}
diff --git a/packages/cli/templates/react/igr-es6/pie-chart/default/files/src/views/__path__/index.js b/packages/cli/templates/react/igr-es6/pie-chart/default/files/src/views/__path__/index.js
index 5174ae999..38bc72df1 100644
--- a/packages/cli/templates/react/igr-es6/pie-chart/default/files/src/views/__path__/index.js
+++ b/packages/cli/templates/react/igr-es6/pie-chart/default/files/src/views/__path__/index.js
@@ -58,7 +58,7 @@ export default class $(ClassName) extends Component {
                 <h1 className={style.title}>{this.title}</h1>
                 <div>
                     Read more on the&nbsp;
-                    <a href="https://www.infragistics.com/products/ignite-ui-react/react/components/piechart.html">
+                    <a href="https://www.infragistics.com/products/ignite-ui-react/react/components/pie-chart.html">
                         official documentation page
                     </a>
                 </div>
diff --git a/packages/cli/templates/react/igr-ts/grid/basic/files/src/app/__path__/__filePrefix__.tsx b/packages/cli/templates/react/igr-ts/grid/basic/files/src/app/__path__/__filePrefix__.tsx
index 59fce80ab..ac53526e6 100644
--- a/packages/cli/templates/react/igr-ts/grid/basic/files/src/app/__path__/__filePrefix__.tsx
+++ b/packages/cli/templates/react/igr-ts/grid/basic/files/src/app/__path__/__filePrefix__.tsx
@@ -15,7 +15,7 @@ export default function $(ClassName)() {
       <h1 className={style.title}>{title}</h1>
       <div>
         Read more on the&nbsp;
-        <a href="https://www.infragistics.com/products/ignite-ui-react/react/components/grid.html">
+        <a href="https://www.infragistics.com/products/ignite-ui-react/react/components/grids/data-grid.html">
           official documentation page
         </a>
       </div>
@@ -49,9 +49,6 @@ export default function $(ClassName)() {
             </IgrColumn>
           </IgrGrid>
         </div>
-        <div className={style.grid}>
-          <IgrGrid autoGenerate={true} data={data} />
-        </div>
       </div>
     </div>
   );
diff --git a/packages/cli/templates/react/igr-ts/grid/basic/index.ts b/packages/cli/templates/react/igr-ts/grid/basic/index.ts
index 0d9907cc6..24f873e9f 100644
--- a/packages/cli/templates/react/igr-ts/grid/basic/index.ts
+++ b/packages/cli/templates/react/igr-ts/grid/basic/index.ts
@@ -14,8 +14,8 @@ class GridTemplate extends IgniteUIForReactTemplate {
 		this.projectType = "igr-ts";
 		this.components = ["Grid"];
 		this.controlGroup = "Data Grids";
-		this.packages = ["igniteui-react-grids@~19.0.0", "igniteui-react-inputs@~19.0.0",
-			"igniteui-react-layouts@~19.0.0", "igniteui-react@~19.2.0"];
+		this.packages = ["igniteui-react-grids@~19.2.1", "igniteui-react-inputs@~19.0.1",
+			"igniteui-react-layouts@~19.0.1", "igniteui-react@~19.2.1"];
 
 		this.hasExtraConfiguration = false;
 	}
diff --git a/packages/cli/templates/react/igr-ts/grid/index.ts b/packages/cli/templates/react/igr-ts/grid/index.ts
index ae88539fe..b617d80f7 100644
--- a/packages/cli/templates/react/igr-ts/grid/index.ts
+++ b/packages/cli/templates/react/igr-ts/grid/index.ts
@@ -7,7 +7,7 @@ class IgrTsDataGridComponent extends BaseComponent {
 	constructor() {
 		super(__dirname);
 		this.name = "Data Grid";
-		this.group = "Grids & Lists";
+		this.group = "Grids";
 		this.description = "pick from grids: basic, sorting, templating.";
 	}
 }
diff --git a/packages/cli/templates/react/igr-ts/groups.json b/packages/cli/templates/react/igr-ts/groups.json
index 579789370..f55a8a30b 100644
--- a/packages/cli/templates/react/igr-ts/groups.json
+++ b/packages/cli/templates/react/igr-ts/groups.json
@@ -1,5 +1,5 @@
 {
 	"Gauges": "scale measure Controls including Linear and Radial Gauge and Bullet Graph.",
 	"Charts": "high-performance data visualization for category and financial data.",
-	"Grids & Lists": "bind and display data sets with little coding or configuration."
+	"Grids": "bind and display data sets with little coding or configuration."
 }
diff --git a/packages/cli/templates/react/igr-ts/pie-chart/default/files/src/app/__path__/__filePrefix__.tsx b/packages/cli/templates/react/igr-ts/pie-chart/default/files/src/app/__path__/__filePrefix__.tsx
index 898a90045..f6442bbcf 100644
--- a/packages/cli/templates/react/igr-ts/pie-chart/default/files/src/app/__path__/__filePrefix__.tsx
+++ b/packages/cli/templates/react/igr-ts/pie-chart/default/files/src/app/__path__/__filePrefix__.tsx
@@ -31,7 +31,7 @@ export default function $(ClassName)() {
       <h1 className={style.title}>{title}</h1>
       <div>
         Read more on the&nbsp;
-        <a href="https://www.infragistics.com/products/ignite-ui-react/react/components/piechart.html">
+        <a href="https://www.infragistics.com/products/ignite-ui-react/react/components/pie-chart.html">
           official documentation page
         </a>
       </div>