From 588118a19ad03faa84e8c80279fb70b5e0a0a73d Mon Sep 17 00:00:00 2001
From: mddifilippo89 <mdifilippo@infragistics.com>
Date: Tue, 19 Sep 2023 14:58:36 -0400
Subject: [PATCH 1/2] mdd-update-23.2.18

mdd-update-23.2.18
---
 browser/package.json                          |  17 +-
 browser/scripts/browser.js                    |  20 +-
 browser/src/app/app-routing.module.ts         |   2 +-
 browser/src/app/index/index.component.ts      |   4 +-
 browser/src/assets/stats.json                 | 274 +++++++++---------
 browser/src/browser-info.json                 |  18 +-
 package-lock.json                             |   6 -
 .../annotations-all/package.json              |   8 +-
 .../annotations-callouts/package.json         |   8 +-
 .../annotations-crosshairs/package.json       |   8 +-
 .../annotations-custom/package.json           |   8 +-
 .../annotations-final-value/package.json      |   8 +-
 .../annotations-highlighting/package.json     |   8 +-
 .../category-chart/annotations/package.json   |   4 +-
 .../annotations/src/app/app.module.ts         |   1 -
 .../area-chart-multiple-sources/package.json  |   4 +-
 .../area-chart-single-source/package.json     |   4 +-
 .../area-chart-styling/package.json           |   4 +-
 .../category-chart/axis-gap/package.json      |   8 +-
 .../axis-gridlines/package.json               |   8 +-
 .../category-chart/axis-inverted/package.json |   8 +-
 .../category-chart/axis-labels/package.json   |   8 +-
 .../axis-locations/package.json               |   8 +-
 .../category-chart/axis-options/package.json  |   4 +-
 .../category-chart/axis-overlap/package.json  |   8 +-
 .../category-chart/axis-range/package.json    |   8 +-
 .../axis-tickmarks/package.json               |   8 +-
 .../category-chart/axis-titles/package.json   |   4 +-
 .../package.json                              |   4 +-
 .../column-chart-single-source/package.json   |   4 +-
 .../column-chart-styling/package.json         |   4 +-
 .../package.json                              |   4 +-
 .../src/app/app.module.ts                     |   1 -
 .../column-chart-with-tooltips/package.json   |   8 +-
 .../data-aggregations/package.json            |   8 +-
 .../package.json                              |   4 +-
 .../category-chart/data-legend/package.json   |   4 +-
 .../package.json                              |   4 +-
 .../data-tooltip-positioning/package.json     |   8 +-
 .../category-chart/data-tooltip/package.json  |   4 +-
 .../high-frequency/package.json               |   4 +-
 .../high-frequency/src/app/app.module.ts      |   1 -
 .../category-chart/high-volume/package.json   |   4 +-
 .../high-volume/src/app/app.module.ts         |   1 -
 .../category-chart/highlighting/package.json  |   4 +-
 .../highlighting/src/app/app.module.ts        |   1 -
 .../line-chart-multiple-sources/package.json  |   4 +-
 .../line-chart-single-source/package.json     |   4 +-
 .../line-chart-styling/package.json           |   4 +-
 .../line-chart-with-animations/package.json   |   4 +-
 .../src/app/app.module.ts                     |   1 -
 .../line-chart-with-annotations/package.json  |   4 +-
 .../src/app/app.module.ts                     |   1 -
 .../line-chart-with-legend/package.json       |   4 +-
 .../src/app/app.module.ts                     |   1 -
 .../marker-options/package.json               |   8 +-
 .../marker-templates/package.json             |   4 +-
 .../marker-templates/src/app/app.module.ts    |   1 -
 .../category-chart/overview/package.json      |   4 +-
 .../point-chart-multiple-sources/package.json |   4 +-
 .../point-chart-single-source/package.json    |   4 +-
 .../point-chart-styling/package.json          |   4 +-
 .../spline-area-multiple-sources/package.json |   4 +-
 .../spline-area-single-source/package.json    |   4 +-
 .../spline-area-styling/package.json          |   4 +-
 .../spline-multiple-sources/package.json      |   4 +-
 .../spline-single-source/package.json         |   4 +-
 .../spline-styling/package.json               |   4 +-
 .../category-chart/stack-columns/package.json |   4 +-
 .../stack-columns/src/app/app.module.ts       |   1 -
 .../step-area-multiple-sources/package.json   |   4 +-
 .../step-area-single-source/package.json      |   4 +-
 .../step-area-styling/package.json            |   4 +-
 .../step-line-multiple-sources/package.json   |   4 +-
 .../step-line-single-source/package.json      |   4 +-
 .../step-line-styling/package.json            |   4 +-
 .../tooltip-template/package.json             |   4 +-
 .../tooltip-template/src/app/app.module.ts    |   1 -
 .../category-chart/tooltip-types/package.json |   4 +-
 .../tooltip-types/src/app/app.module.ts       |   1 -
 .../category-chart/trendline/package.json     |   4 +-
 .../trendline/src/app/app.module.ts           |   1 -
 .../category-chart/value-lines/package.json   |   8 +-
 .../annotations-custom/package.json           |   4 +-
 .../package.json                              |   4 +-
 .../data-chart/axis-annotations/package.json  |   4 +-
 .../axis-annotations/src/app/app.module.ts    |   1 -
 .../data-chart/axis-crossing/package.json     |   4 +-
 .../axis-crossing/src/app/app.module.ts       |   1 -
 .../axis-label-rotation/package.json          |   8 +-
 .../data-chart/axis-locations/package.json    |   4 +-
 .../axis-locations/src/app/app.module.ts      |   1 -
 .../data-chart/axis-min-max-gap/package.json  |   4 +-
 .../data-chart/axis-settings/package.json     |   4 +-
 .../axis-settings/src/app/app.module.ts       |   3 +-
 .../data-chart/axis-sharing/package.json      |   4 +-
 .../axis-sharing/src/app/app.module.ts        |   3 +-
 .../charts/data-chart/axis-types/package.json |   4 +-
 .../axis-types/src/app/app.module.ts          |   3 +-
 .../bar-chart-multiple-sources/package.json   |   4 +-
 .../bar-chart-overlapping/package.json        |   4 +-
 .../bar-chart-single-source/package.json      |   4 +-
 .../data-chart/bar-chart-styling/package.json |   4 +-
 .../callout-layer-styling/package.json        |   4 +-
 .../data-chart/chart-navigation/package.json  |   4 +-
 .../chart-navigation/src/app/app.module.ts    |   3 +-
 .../data-chart/chart-overview/package.json    |   4 +-
 .../chart-overview/src/app/app.module.ts      |   3 +-
 .../data-chart/chart-performance/package.json |   4 +-
 .../chart-performance/src/app/app.module.ts   |   3 +-
 .../chart-synchronization/package.json        |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../data-chart/chart-titles/package.json      |   4 +-
 .../chart-titles/src/app/app.module.ts        |   3 +-
 .../column-chart-styling/package.json         |   4 +-
 .../src/app/app.module.ts                     |   1 -
 .../data-chart/composite-chart/package.json   |   4 +-
 .../composite-chart/src/app/app.module.ts     |   1 -
 .../crosshair-layer-styling/package.json      |   4 +-
 .../src/app/app.module.ts                     |   1 -
 .../data-chart/dash-array-axes/package.json   |   4 +-
 .../data-chart/dash-array-series/package.json |   4 +-
 .../dash-array-tickmarks/package.json         |   4 +-
 .../dash-array-trendline/package.json         |   4 +-
 .../data-chart/data-legend/package.json       |   4 +-
 .../data-chart/data-tooltip/package.json      |   4 +-
 .../final-value-layer-styling/package.json    |   4 +-
 .../src/app/app.module.ts                     |   1 -
 .../financial-price-series/package.json       |   4 +-
 .../charts/data-chart/legends/package.json    |   4 +-
 .../data-chart/legends/src/app/app.module.ts  |   3 +-
 .../polar-area-chart-styling/package.json     |   4 +-
 .../data-chart/polar-area-chart/package.json  |   4 +-
 .../data-chart/polar-chart-types/package.json |   4 +-
 .../polar-chart-types/src/app/app.module.ts   |   3 +-
 .../data-chart/polar-line-chart/package.json  |   4 +-
 .../polar-scatter-chart/package.json          |   4 +-
 .../polar-spline-area-chart/package.json      |   4 +-
 .../polar-spline-chart/package.json           |   4 +-
 .../radial-area-chart-styling/package.json    |   4 +-
 .../data-chart/radial-area-chart/package.json |   4 +-
 .../radial-chart-types/package.json           |   4 +-
 .../radial-chart-types/src/app/app.module.ts  |   3 +-
 .../radial-column-chart/package.json          |   4 +-
 .../data-chart/radial-line-chart/package.json |   4 +-
 .../data-chart/radial-pie-chart/package.json  |   4 +-
 .../data-chart/range-area-chart/package.json  |   4 +-
 .../range-column-chart/package.json           |   4 +-
 .../package.json                              |   4 +-
 .../src/app.module.ts                         |   1 -
 .../package.json                              |   4 +-
 .../src/app.module.ts                         |   1 -
 .../scatter-bubble-chart-styling/package.json |   4 +-
 .../src/app.module.ts                         |   1 -
 .../scatter-line-chart/package.json           |   4 +-
 .../scatter-point-chart/package.json          |   4 +-
 .../scatter-spline-chart/package.json         |   4 +-
 .../data-chart/series-animations/package.json |   4 +-
 .../series-animations/src/app/app.module.ts   |   3 +-
 .../series-annotations/package.json           |   4 +-
 .../series-annotations/src/app/app.module.ts  |   3 +-
 .../series-highlighting/package.json          |   4 +-
 .../series-highlighting/src/app/app.module.ts |   3 +-
 .../series-marker-template/package.json       |   4 +-
 .../src/app/app.module.ts                     |   1 -
 .../data-chart/series-markers/package.json    |   4 +-
 .../series-markers/src/app/app.module.ts      |   3 +-
 .../data-chart/series-tooltips/package.json   |   4 +-
 .../series-tooltips/src/app/app.module.ts     |   3 +-
 .../data-chart/series-trendlines/package.json |   4 +-
 .../series-trendlines/src/app/app.module.ts   |   3 +-
 .../series-value-overlay/package.json         |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../stacked-100-area-chart/package.json       |   4 +-
 .../stacked-100-bar-chart/package.json        |   4 +-
 .../stacked-100-column-chart/package.json     |   4 +-
 .../stacked-100-line-chart/package.json       |   4 +-
 .../package.json                              |   4 +-
 .../stacked-100-spline-chart/package.json     |   4 +-
 .../stacked-area-chart/package.json           |   4 +-
 .../data-chart/stacked-bar-chart/package.json |   4 +-
 .../stacked-chart-types/package.json          |   4 +-
 .../stacked-chart-types/src/app/app.module.ts |   3 +-
 .../stacked-column-chart/package.json         |   4 +-
 .../stacked-line-chart/package.json           |   4 +-
 .../stacked-spline-area-chart/package.json    |   4 +-
 .../stacked-spline-chart/package.json         |   4 +-
 .../data-chart/tooltip-template/package.json  |   4 +-
 .../tooltip-template/src/app/app.module.ts    |   1 -
 .../data-chart/transition-event/package.json  |   8 +-
 .../type-category-area-series/package.json    |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-category-bar-series/package.json     |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-category-column-series/package.json  |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-category-line-series/package.json    |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-category-point-series/package.json   |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-category-series/package.json         |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../package.json                              |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-category-spline-series/package.json  |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../package.json                              |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../package.json                              |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../package.json                              |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../package.json                              |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../package.json                              |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../package.json                              |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../package.json                              |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-financial-ohlc-series/package.json   |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-financial-overlays/package.json      |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-financial-series/package.json        |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-radial-area-series/package.json      |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-radial-column-series/package.json    |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-radial-line-series/package.json      |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-radial-pie-series/package.json       |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-range-area-series/package.json       |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-range-column-series/package.json     |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../data-chart/type-range-series/package.json |   4 +-
 .../type-range-series/src/app/app.module.ts   |   3 +-
 .../type-scatter-area-series/package.json     |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-scatter-bubble-series/package.json   |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-scatter-contour-series/package.json  |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-scatter-hd-series/package.json       |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-scatter-line-series/package.json     |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-scatter-point-series/package.json    |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-scatter-polygon-series/package.json  |   4 +-
 .../src/app/app.module.ts                     |   1 -
 .../type-scatter-polyline-series/package.json |   4 +-
 .../src/app/app.module.ts                     |   1 -
 .../type-scatter-series/package.json          |   4 +-
 .../type-scatter-series/src/app/app.module.ts |   3 +-
 .../type-scatter-spline-series/package.json   |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../data-chart/type-shape-series/package.json |   4 +-
 .../type-shape-series/src/app/app.module.ts   |   3 +-
 .../type-stacked-100-area-series/package.json |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-stacked-100-bar-series/package.json  |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../package.json                              |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-stacked-100-line-series/package.json |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../package.json                              |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../package.json                              |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-stacked-area-series/package.json     |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-stacked-bar-series/package.json      |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-stacked-column-series/package.json   |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-stacked-line-series/package.json     |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../package.json                              |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../type-stacked-spline-series/package.json   |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../data-chart/waterfall-chart/package.json   |   4 +-
 .../doughnut-chart/animation/package.json     |   4 +-
 .../animation/src/app/app.module.ts           |   1 -
 .../doughnut-chart/explosion/package.json     |   4 +-
 .../explosion/src/app/app.module.ts           |   1 -
 .../charts/doughnut-chart/legend/package.json |   4 +-
 .../doughnut-chart/overview/package.json      |   4 +-
 .../charts/doughnut-chart/rings/package.json  |   4 +-
 .../doughnut-chart/selection/package.json     |   4 +-
 .../selection/src/app/app.module.ts           |   1 -
 .../financial-chart/annotations/package.json  |   4 +-
 .../annotations/src/app/app.module.ts         |   3 +-
 .../financial-chart/axis-types/package.json   |   4 +-
 .../axis-types/src/app/app.module.ts          |   3 +-
 .../package.json                              |   4 +-
 .../data-legend-styling-props/package.json    |   4 +-
 .../financial-chart/data-legend/package.json  |   4 +-
 .../package.json                              |   4 +-
 .../data-tooltip-styling-props/package.json   |   4 +-
 .../financial-chart/data-tooltip/package.json |   4 +-
 .../high-frequency/package.json               |   4 +-
 .../high-frequency/src/app/app.module.ts      |   1 -
 .../financial-chart/high-volume/package.json  |   4 +-
 .../high-volume/src/app/app.module.ts         |   3 +-
 .../indicator-customization/package.json      |   4 +-
 .../src/app/app.module.ts                     |   3 +-
 .../indicator-types/package.json              |   4 +-
 .../indicator-types/src/app/app.module.ts     |   3 +-
 .../multiple-data/package.json                |   4 +-
 .../multiple-data/src/app/app.module.ts       |   3 +-
 .../multiple-feeds/package.json               |   4 +-
 .../multiple-feeds/src/app/app.module.ts      |   1 -
 .../financial-chart/overview/package.json     |   4 +-
 .../overview/src/app/app.module.ts            |   3 +-
 .../charts/financial-chart/panes/package.json |   4 +-
 .../panes/src/app/app.module.ts               |   3 +-
 .../financial-chart/performance/package.json  |   4 +-
 .../performance/src/app/app.module.ts         |   3 +-
 .../financial-chart/scrollbars/package.json   |   4 +-
 .../stock-index-chart/package.json            |   4 +-
 .../stock-index-chart/src/app/app.module.ts   |   3 +-
 .../financial-chart/styling/package.json      |   4 +-
 .../styling/src/app/app.module.ts             |   3 +-
 .../financial-chart/theming/package.json      |   4 +-
 .../theming/src/app/app.module.ts             |   3 +-
 .../time-based-data/package.json              |   4 +-
 .../time-based-data/src/app/app.module.ts     |   3 +-
 .../financial-chart/titles/package.json       |   4 +-
 .../titles/src/app/app.module.ts              |   3 +-
 .../tooltip-template/package.json             |   4 +-
 .../tooltip-template/src/app/app.module.ts    |   3 +-
 .../tooltip-types/package.json                |   4 +-
 .../tooltip-types/src/app/app.module.ts       |   3 +-
 .../financial-chart/trendlines/package.json   |   4 +-
 .../trendlines/src/app/app.module.ts          |   3 +-
 .../financial-chart/volume-types/package.json |   4 +-
 .../volume-types/src/app/app.module.ts        |   3 +-
 .../charts/pie-chart/animation/package.json   |   4 +-
 .../pie-chart/animation/src/app/app.module.ts |   1 -
 .../charts/pie-chart/explosion/package.json   |   4 +-
 .../pie-chart/explosion/src/app/app.module.ts |   1 -
 samples/charts/pie-chart/legend/package.json  |   4 +-
 samples/charts/pie-chart/others/package.json  |   4 +-
 .../charts/pie-chart/overview/package.json    |   4 +-
 .../charts/pie-chart/selection/package.json   |   4 +-
 .../pie-chart/selection/src/app/app.module.ts |   1 -
 samples/charts/pie-chart/styling/package.json |   4 +-
 .../sparkline/display-area/package.json       |   4 +-
 .../sparkline/display-column/package.json     |   4 +-
 .../sparkline/display-lines/package.json      |   8 +-
 .../sparkline/display-types/package.json      |   4 +-
 .../display-types/src/app/app.module.ts       |   1 -
 .../sparkline/display-winloss/package.json    |   4 +-
 samples/charts/sparkline/grid/package.json    |   4 +-
 .../sparkline/grid/src/app/app.module.ts      |   3 +-
 samples/charts/sparkline/markers/package.json |   8 +-
 .../sparkline/normal-range/package.json       |   8 +-
 .../charts/sparkline/trendlines/package.json  |   8 +-
 .../sparkline/unknown-values/package.json     |   8 +-
 .../package.json                              |   8 +-
 .../actions-built-in-data-chart/package.json  |   8 +-
 .../package.json                              |   8 +-
 .../package.json                              |   8 +-
 samples/charts/toolbar/theming/package.json   |   8 +-
 samples/charts/tree-map/events/package.json   |   4 +-
 .../tree-map/events/src/app/app.module.ts     |   1 -
 samples/charts/tree-map/layout/package.json   |   8 +-
 samples/charts/tree-map/overview/package.json |   4 +-
 samples/charts/tree-map/styling/package.json  |   4 +-
 .../charts/zoomslider/overview/package.json   |   4 +-
 .../zoomslider/overview/src/app/app.module.ts |   3 +-
 .../operations-on-workbooks/package.json      |   4 +-
 .../src/app/app.module.ts                     |   1 -
 .../operations-on-worksheets/package.json     |   4 +-
 .../src/app/app.module.ts                     |   1 -
 .../excel/excel-library/overview/package.json |   4 +-
 .../overview/src/app/app.module.ts            |   1 -
 .../working-with-cells/package.json           |   4 +-
 .../working-with-cells/src/app/app.module.ts  |   1 -
 .../working-with-charts/package.json          |   6 +-
 .../working-with-charts/src/app/app.module.ts |   1 -
 .../working-with-sparklines/package.json      |   6 +-
 .../src/app/app.module.ts                     |   1 -
 .../working-with-tables/package.json          |   8 +-
 .../working-with-tables/src/app/app.module.ts |   1 -
 .../excel/spreadsheet/activation/package.json |   6 +-
 .../activation/src/app/app.module.ts          |   3 +-
 .../spreadsheet/adapter-chart/package.json    |  10 +-
 .../adapter-chart/src/app/app.module.ts       |   3 +-
 .../spreadsheet/adapter-combo/package.json    |  10 +-
 .../adapter-combo/src/app/app.module.ts       |   3 +-
 .../excel/spreadsheet/clipboard/package.json  |   6 +-
 .../clipboard/src/app/app.module.ts           |   3 +-
 .../excel/spreadsheet/commands/package.json   |   6 +-
 .../commands/src/app/app.module.ts            |   3 +-
 .../conditional-formatting/package.json       |   6 +-
 .../src/app/app.module.ts                     |   3 +-
 .../spreadsheet/config-options/package.json   |   6 +-
 .../config-options/src/app/app.module.ts      |   3 +-
 .../spreadsheet/data-validation/package.json  |   6 +-
 .../data-validation/src/app/app.module.ts     |   1 -
 .../excel/spreadsheet/hyperlinks/package.json |   6 +-
 .../hyperlinks/src/app/app.module.ts          |   3 +-
 .../excel/spreadsheet/overview/package.json   |   6 +-
 .../overview/src/app/app.module.ts            |   3 +-
 .../bullet-graph/animation/package.json       |   4 +-
 .../animation/src/app/app.module.ts           |   1 -
 .../bullet-graph/background/package.json      |   4 +-
 .../background/src/app/app.module.ts          |   1 -
 .../gauges/bullet-graph/labels/package.json   |   4 +-
 .../bullet-graph/labels/src/app/app.module.ts |   1 -
 .../gauges/bullet-graph/measures/package.json |   4 +-
 .../measures/src/app/app.module.ts            |   1 -
 .../gauges/bullet-graph/ranges/package.json   |   4 +-
 .../bullet-graph/ranges/src/app/app.module.ts |   1 -
 .../gauges/bullet-graph/scale/package.json    |   4 +-
 .../bullet-graph/scale/src/app/app.module.ts  |   1 -
 .../bullet-graph/tickmarks/package.json       |   4 +-
 .../tickmarks/src/app/app.module.ts           |   1 -
 .../linear-gauge/animation/package.json       |   4 +-
 .../animation/src/app/app.module.ts           |   1 -
 .../gauges/linear-gauge/backing/package.json  |   4 +-
 .../backing/src/app/app.module.ts             |   1 -
 .../gauges/linear-gauge/labels/package.json   |   4 +-
 .../linear-gauge/labels/src/app/app.module.ts |   1 -
 .../gauges/linear-gauge/needle/package.json   |   4 +-
 .../linear-gauge/needle/src/app/app.module.ts |   1 -
 .../gauges/linear-gauge/ranges/package.json   |   4 +-
 .../linear-gauge/ranges/src/app/app.module.ts |   1 -
 .../gauges/linear-gauge/scale/package.json    |   4 +-
 .../linear-gauge/scale/src/app/app.module.ts  |   1 -
 .../linear-gauge/tickmarks/package.json       |   4 +-
 .../tickmarks/src/app/app.module.ts           |   1 -
 .../radial-gauge/animation/package.json       |   4 +-
 .../animation/src/app/app.module.ts           |   1 -
 .../gauges/radial-gauge/backing/package.json  |   4 +-
 .../backing/src/app/app.module.ts             |   1 -
 .../gauges/radial-gauge/labels/package.json   |   4 +-
 .../radial-gauge/labels/src/app/app.module.ts |   1 -
 .../gauges/radial-gauge/needle/package.json   |   4 +-
 .../radial-gauge/needle/src/app/app.module.ts |   1 -
 .../gauges/radial-gauge/ranges/package.json   |   4 +-
 .../radial-gauge/ranges/src/app/app.module.ts |   1 -
 .../gauges/radial-gauge/scale/package.json    |   4 +-
 .../radial-gauge/scale/src/app/app.module.ts  |   1 -
 .../radial-gauge/tickmarks/package.json       |   4 +-
 .../tickmarks/src/app/app.module.ts           |   1 -
 .../geo-map/binding-data-csv/package.json     |   6 +-
 .../binding-data-csv/src/app/app.module.ts    |   1 -
 .../binding-data-json-points/package.json     |   6 +-
 .../src/app/app.module.ts                     |   1 -
 .../geo-map/binding-data-model/package.json   |   6 +-
 .../binding-data-model/src/app/app.module.ts  |   1 -
 .../binding-multiple-shapes/package.json      |   6 +-
 .../src/app/app.module.ts                     |   1 -
 .../binding-multiple-sources/package.json     |   6 +-
 .../src/app/app.module.ts                     |   1 -
 .../geo-map/binding-shp-points/package.json   |   6 +-
 .../binding-shp-points/src/app/app.module.ts  |   1 -
 .../geo-map/binding-shp-polygons/package.json |   6 +-
 .../src/app/app.module.ts                     |   1 -
 .../binding-shp-polylines/package.json        |   6 +-
 .../src/app/app.module.ts                     |   1 -
 .../maps/geo-map/custom-tooltips/package.json |   6 +-
 .../custom-tooltips/src/app/app.module.ts     |   1 -
 .../geo-map/display-bing-imagery/package.json |   6 +-
 .../src/app/app.module.ts                     |   1 -
 .../geo-map/display-esri-imagery/package.json |   6 +-
 .../src/app/app.module.ts                     |   1 -
 .../geo-map/display-heat-imagery/package.json |   6 +-
 .../src/app/app.module.ts                     |   1 -
 .../geo-map/display-osm-imagery/package.json  |   6 +-
 .../display-osm-imagery/src/app/app.module.ts |   1 -
 .../maps/geo-map/marker-layouts/package.json  |   6 +-
 .../marker-layouts/src/app/app.module.ts      |   1 -
 .../maps/geo-map/marker-template/package.json |   6 +-
 .../marker-template/src/app/app.module.ts     |   1 -
 samples/maps/geo-map/marker-type/package.json |   6 +-
 .../geo-map/marker-type/src/app/app.module.ts |   1 -
 samples/maps/geo-map/navigation/package.json  |   6 +-
 .../geo-map/navigation/src/app/app.module.ts  |   1 -
 samples/maps/geo-map/overview/package.json    |   6 +-
 .../geo-map/overview/src/app/app.module.ts    |   1 -
 .../maps/geo-map/shape-styling/package.json   |   6 +-
 .../shape-styling/src/app/app.module.ts       |   1 -
 .../geo-map/triangulating-data/package.json   |   6 +-
 .../triangulating-data/src/app/app.module.ts  |   1 -
 .../type-scatter-area-series/package.json     |   6 +-
 .../src/app/app.module.ts                     |   1 -
 .../type-scatter-bubble-series/package.json   |   6 +-
 .../src/app/app.module.ts                     |   1 -
 .../type-scatter-contour-series/package.json  |   6 +-
 .../src/app/app.module.ts                     |   1 -
 .../type-scatter-density-series/package.json  |   6 +-
 .../src/app/app.module.ts                     |   1 -
 .../type-scatter-symbol-series/package.json   |   6 +-
 .../src/app/app.module.ts                     |   1 -
 .../type-shape-polygon-series/package.json    |   6 +-
 .../src/app/app.module.ts                     |   1 -
 .../type-shape-polyline-series/package.json   |   6 +-
 .../src/app/app.module.ts                     |   1 -
 507 files changed, 998 insertions(+), 1188 deletions(-)
 delete mode 100644 package-lock.json

diff --git a/browser/package.json b/browser/package.json
index db826fc0a..7be27cde3 100644
--- a/browser/package.json
+++ b/browser/package.json
@@ -41,15 +41,16 @@
     "immediate": "3.2.3",
     "igniteui-angular": "16.0.7",
     "igniteui-theming": "1.4.14",
-    "igniteui-angular-core": "16.1.0",
     "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-excel": "16.1.0",
-    "igniteui-angular-gauges": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
-    "igniteui-angular-spreadsheet": "16.1.0",
-    "igniteui-angular-spreadsheet-chart-adapter": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-excel": "23.2.18",
+    "@infragistics/igniteui-angular-gauges": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
+    "@infragistics/igniteui-angular-spreadsheet": "23.2.18",
+    "@infragistics/igniteui-angular-spreadsheet-chart-adapter": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/browser/scripts/browser.js b/browser/scripts/browser.js
index 1cead44ce..9525a3f4c 100644
--- a/browser/scripts/browser.js
+++ b/browser/scripts/browser.js
@@ -1022,16 +1022,16 @@ function updateIG(cb) {
     // { name:               "igniteui-angular-charts", version: "14.1.0" },  // npm
     let packageUpgrades = [
         // these IG packages are often updated:
-        { name: "igniteui-angular-core"                     , version: "16.1.0" },
-        { name: "igniteui-angular-charts"                   , version: "16.1.0" },
-        { name: "igniteui-angular-excel"                    , version: "16.1.0" },
-        { name: "igniteui-angular-gauges"                   , version: "16.1.0" },
-        { name: "igniteui-angular-inputs"                   , version: "16.1.0" },
-        { name: "igniteui-angular-layouts"                  , version: "16.1.0" },
-        { name: "igniteui-angular-maps"                     , version: "16.1.0" },
-        { name: "igniteui-angular-spreadsheet-chart-adapter", version: "16.1.0" },
-        { name: "igniteui-angular-spreadsheet"              , version: "16.1.0" },
-        { name: "igniteui-angular-datasources"              , version: "16.1.0" },
+        { name: "igniteui-angular-core"                     , version: "23.2.18" },
+        { name: "igniteui-angular-charts"                   , version: "23.2.18" },
+        { name: "igniteui-angular-excel"                    , version: "23.2.18" },
+        { name: "igniteui-angular-gauges"                   , version: "23.2.18" },
+        { name: "igniteui-angular-inputs"                   , version: "23.2.18" },
+        { name: "igniteui-angular-layouts"                  , version: "23.2.18" },
+        { name: "igniteui-angular-maps"                     , version: "23.2.18" },
+        { name: "igniteui-angular-spreadsheet-chart-adapter", version: "23.2.18" },
+        { name: "igniteui-angular-spreadsheet"              , version: "23.2.18" },
+        { name: "igniteui-angular-datasources"              , version: "23.2.18" },
         // these IG packages are sometimes updated:
         { name: "igniteui-webcomponents",            version: "4.3.0-beta.0" },
         { name: "igniteui-theming",                  version: "1.4.14" },
diff --git a/browser/src/app/app-routing.module.ts b/browser/src/app/app-routing.module.ts
index fe7db51f6..65637006e 100644
--- a/browser/src/app/app-routing.module.ts
+++ b/browser/src/app/app-routing.module.ts
@@ -16,8 +16,8 @@ export const samplesRoutes: Routes = [
     // note these section is auto-generated - do not change it:
     // Auto-Insert-Modules-Start
     { path: "charts", data: ["SamplesForCharts"], loadChildren: () => import("../samples/charts/samples-modules").then(m => m.SamplesForCharts) },
-    { path: "excel", data: ["SamplesForExcel"], loadChildren: () => import("../samples/excel/samples-modules").then(m => m.SamplesForExcel) },
     { path: "gauges", data: ["SamplesForGauges"], loadChildren: () => import("../samples/gauges/samples-modules").then(m => m.SamplesForGauges) },
+    { path: "excel", data: ["SamplesForExcel"], loadChildren: () => import("../samples/excel/samples-modules").then(m => m.SamplesForExcel) },
     { path: "maps", data: ["SamplesForMaps"], loadChildren: () => import("../samples/maps/samples-modules").then(m => m.SamplesForMaps) }
 
 
diff --git a/browser/src/app/index/index.component.ts b/browser/src/app/index/index.component.ts
index 6213578a9..2700cd69a 100644
--- a/browser/src/app/index/index.component.ts
+++ b/browser/src/app/index/index.component.ts
@@ -9,8 +9,8 @@ import BrowserInfo  from "../../browser-info.json";
 // note these section is auto-generated - do not change it:
 // Auto-Insert-Imports-RoutingData-Start
 import { RoutingDataForCharts } from "../../samples/charts/routing-data";
-import { RoutingDataForExcel } from "../../samples/excel/routing-data";
 import { RoutingDataForGauges } from "../../samples/gauges/routing-data";
+import { RoutingDataForExcel } from "../../samples/excel/routing-data";
 import { RoutingDataForMaps } from "../../samples/maps/routing-data";
 
 
@@ -48,8 +48,8 @@ export class IndexComponent implements OnInit, AfterViewInit {
     private modulesRoutes = [
         // Auto-Insert-SamplesRoutingArray-Start
         { path: "charts", routesData: RoutingDataForCharts },
-        { path: "excel", routesData: RoutingDataForExcel },
         { path: "gauges", routesData: RoutingDataForGauges },
+        { path: "excel", routesData: RoutingDataForExcel },
         { path: "maps", routesData: RoutingDataForMaps }
 
 
diff --git a/browser/src/assets/stats.json b/browser/src/assets/stats.json
index a45aaf2e5..849b514bd 100644
--- a/browser/src/assets/stats.json
+++ b/browser/src/assets/stats.json
@@ -1,89 +1,22 @@
 [
-  { "browser": true,  "xplat": false, "path": "charts/category-chart/annotations" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/annotations-all" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/annotations-callouts" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/annotations-crosshairs" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/annotations-final-value" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/annotations-highlighting" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/area-chart-multiple-sources" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/area-chart-single-source" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/area-chart-styling" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/axis-gap" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/axis-gridlines" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/axis-inverted" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/axis-labels" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/axis-locations" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/axis-options" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/axis-overlap" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/axis-range" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/axis-tickmarks" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/axis-titles" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/column-chart-multiple-sources" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/column-chart-single-source" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/column-chart-styling" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/column-chart-with-highlighting" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/column-chart-with-tooltips" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/data-aggregations" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/data-legend" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/data-legend-formatting-decimals" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/data-tooltip" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/data-tooltip-formatting-decimals" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/data-tooltip-positioning" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/high-frequency" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/high-volume" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/highlighting" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/line-chart-multiple-sources" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/line-chart-single-source" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/line-chart-styling" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/line-chart-with-animations" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/line-chart-with-annotations" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/line-chart-with-legend" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/marker-options" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/marker-templates" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/overview" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/point-chart-multiple-sources" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/point-chart-single-source" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/point-chart-styling" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/spline-area-multiple-sources" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/spline-area-single-source" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/spline-area-styling" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/spline-multiple-sources" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/spline-single-source" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/spline-styling" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/stack-columns" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/step-area-multiple-sources" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/step-area-single-source" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/step-area-styling" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/step-line-multiple-sources" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/step-line-single-source" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/step-line-styling" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/tooltip-template" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/tooltip-types" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/trendline" },
-  { "browser": false, "xplat": false, "path": "charts/category-chart/value-lines" },
-  { "browser": false, "xplat": false, "path": "charts/doughnut-chart/animation" },
-  { "browser": false, "xplat": false, "path": "charts/doughnut-chart/explosion" },
-  { "browser": false, "xplat": false, "path": "charts/doughnut-chart/legend" },
-  { "browser": false, "xplat": false, "path": "charts/doughnut-chart/overview" },
-  { "browser": false, "xplat": false, "path": "charts/doughnut-chart/rings" },
-  { "browser": false, "xplat": false, "path": "charts/doughnut-chart/selection" },
-  { "browser": false, "xplat": false, "path": "charts/data-chart/axis-annotations" },
+  { "browser": false, "xplat": false, "path": "charts/data-chart/annotations-custom" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/axis-annotations-corner-radius" },
-  { "browser": false, "xplat": false, "path": "charts/data-chart/axis-crossing" },
+  { "browser": false, "xplat": false, "path": "charts/data-chart/axis-annotations" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/axis-label-rotation" },
-  { "browser": false, "xplat": false, "path": "charts/data-chart/axis-locations" },
+  { "browser": false, "xplat": false, "path": "charts/data-chart/axis-crossing" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/axis-min-max-gap" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/axis-settings" },
+  { "browser": false, "xplat": false, "path": "charts/data-chart/axis-locations" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/axis-sharing" },
-  { "browser": false, "xplat": false, "path": "charts/data-chart/axis-types" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/bar-chart-multiple-sources" },
+  { "browser": false, "xplat": false, "path": "charts/data-chart/axis-types" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/bar-chart-overlapping" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/bar-chart-single-source" },
-  { "browser": false, "xplat": false, "path": "charts/data-chart/bar-chart-styling" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/callout-layer-styling" },
-  { "browser": false, "xplat": false, "path": "charts/data-chart/chart-navigation" },
+  { "browser": false, "xplat": false, "path": "charts/data-chart/bar-chart-styling" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/chart-overview" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/chart-performance" },
+  { "browser": false, "xplat": false, "path": "charts/data-chart/chart-navigation" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/chart-synchronization" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/chart-titles" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/column-chart-styling" },
@@ -102,36 +35,36 @@
   { "browser": false, "xplat": false, "path": "charts/data-chart/polar-area-chart-styling" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/polar-chart-types" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/polar-line-chart" },
-  { "browser": false, "xplat": false, "path": "charts/data-chart/polar-scatter-chart" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/polar-spline-area-chart" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/polar-spline-chart" },
+  { "browser": false, "xplat": false, "path": "charts/data-chart/polar-scatter-chart" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/radial-area-chart" },
-  { "browser": false, "xplat": false, "path": "charts/data-chart/radial-area-chart-styling" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/radial-chart-types" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/radial-column-chart" },
+  { "browser": false, "xplat": false, "path": "charts/data-chart/radial-area-chart-styling" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/radial-line-chart" },
-  { "browser": false, "xplat": false, "path": "charts/data-chart/radial-pie-chart" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/range-area-chart" },
+  { "browser": false, "xplat": false, "path": "charts/data-chart/radial-pie-chart" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/range-column-chart" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/scatter-bubble-chart-multiple-sources" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/scatter-bubble-chart-single-source" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/scatter-bubble-chart-styling" },
-  { "browser": false, "xplat": false, "path": "charts/data-chart/scatter-line-chart" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/scatter-point-chart" },
+  { "browser": false, "xplat": false, "path": "charts/data-chart/scatter-line-chart" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/scatter-spline-chart" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/series-animations" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/series-annotations" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/series-highlighting" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/series-marker-template" },
-  { "browser": false, "xplat": false, "path": "charts/data-chart/series-markers" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/series-tooltips" },
-  { "browser": false, "xplat": false, "path": "charts/data-chart/series-trendlines" },
+  { "browser": false, "xplat": false, "path": "charts/data-chart/series-markers" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/series-value-overlay" },
+  { "browser": false, "xplat": false, "path": "charts/data-chart/series-trendlines" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/stacked-100-area-chart" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/stacked-100-bar-chart" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/stacked-100-column-chart" },
-  { "browser": false, "xplat": false, "path": "charts/data-chart/stacked-100-line-chart" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/stacked-100-spline-area-chart" },
+  { "browser": false, "xplat": false, "path": "charts/data-chart/stacked-100-line-chart" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/stacked-100-spline-chart" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/stacked-area-chart" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/stacked-bar-chart" },
@@ -143,10 +76,10 @@
   { "browser": false, "xplat": false, "path": "charts/data-chart/tooltip-template" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/transition-event" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-category-area-series" },
-  { "browser": false, "xplat": false, "path": "charts/data-chart/type-category-bar-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-category-column-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-category-line-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-category-point-series" },
+  { "browser": false, "xplat": false, "path": "charts/data-chart/type-category-bar-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-category-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-category-spline-area-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-category-spline-series" },
@@ -156,30 +89,30 @@
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-financial-area-indicators" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-financial-candlestick-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-financial-column-indicators" },
-  { "browser": false, "xplat": false, "path": "charts/data-chart/type-financial-line-indicators" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-financial-ohlc-series" },
+  { "browser": false, "xplat": false, "path": "charts/data-chart/type-financial-line-indicators" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-financial-overlays" },
-  { "browser": false, "xplat": false, "path": "charts/data-chart/type-financial-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-radial-area-series" },
+  { "browser": false, "xplat": false, "path": "charts/data-chart/type-financial-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-radial-column-series" },
-  { "browser": false, "xplat": false, "path": "charts/data-chart/type-radial-line-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-radial-pie-series" },
+  { "browser": false, "xplat": false, "path": "charts/data-chart/type-radial-line-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-range-area-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-range-column-series" },
+  { "browser": false, "xplat": false, "path": "charts/data-chart/type-scatter-bubble-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-range-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-scatter-area-series" },
-  { "browser": false, "xplat": false, "path": "charts/data-chart/type-scatter-bubble-series" },
-  { "browser": false, "xplat": false, "path": "charts/data-chart/type-scatter-contour-series" },
-  { "browser": false, "xplat": false, "path": "charts/data-chart/type-scatter-hd-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-scatter-line-series" },
+  { "browser": false, "xplat": false, "path": "charts/data-chart/type-scatter-hd-series" },
+  { "browser": false, "xplat": false, "path": "charts/data-chart/type-scatter-contour-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-scatter-point-series" },
-  { "browser": false, "xplat": false, "path": "charts/data-chart/type-scatter-polygon-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-scatter-polyline-series" },
+  { "browser": false, "xplat": false, "path": "charts/data-chart/type-scatter-polygon-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-scatter-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-scatter-spline-series" },
+  { "browser": false, "xplat": false, "path": "charts/data-chart/type-stacked-100-bar-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-shape-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-stacked-100-area-series" },
-  { "browser": false, "xplat": false, "path": "charts/data-chart/type-stacked-100-bar-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-stacked-100-column-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-stacked-100-line-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-stacked-100-spline-area-series" },
@@ -188,88 +121,140 @@
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-stacked-bar-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-stacked-column-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-stacked-line-series" },
-  { "browser": false, "xplat": false, "path": "charts/data-chart/type-stacked-spline-area-series" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/type-stacked-spline-series" },
+  { "browser": false, "xplat": false, "path": "charts/data-chart/type-stacked-spline-area-series" },
+  { "browser": false, "xplat": false, "path": "charts/doughnut-chart/animation" },
+  { "browser": false, "xplat": false, "path": "charts/doughnut-chart/explosion" },
   { "browser": false, "xplat": false, "path": "charts/data-chart/waterfall-chart" },
+  { "browser": false, "xplat": false, "path": "charts/doughnut-chart/overview" },
+  { "browser": false, "xplat": false, "path": "charts/doughnut-chart/legend" },
+  { "browser": false, "xplat": false, "path": "charts/doughnut-chart/rings" },
+  { "browser": true,  "xplat": false, "path": "charts/category-chart/annotations" },
+  { "browser": false, "xplat": false, "path": "charts/doughnut-chart/selection" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/annotations-all" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/annotations-crosshairs" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/annotations-callouts" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/annotations-final-value" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/annotations-custom" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/annotations-highlighting" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/area-chart-multiple-sources" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/area-chart-single-source" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/area-chart-styling" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/axis-gap" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/axis-inverted" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/axis-locations" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/axis-gridlines" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/axis-labels" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/axis-overlap" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/axis-options" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/axis-tickmarks" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/axis-titles" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/column-chart-multiple-sources" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/axis-range" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/column-chart-single-source" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/column-chart-styling" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/column-chart-with-highlighting" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/column-chart-with-tooltips" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/data-aggregations" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/data-legend-formatting-decimals" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/data-tooltip-formatting-decimals" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/data-tooltip" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/data-tooltip-positioning" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/high-frequency" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/highlighting" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/data-legend" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/high-volume" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/line-chart-multiple-sources" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/line-chart-single-source" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/line-chart-with-animations" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/line-chart-with-annotations" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/line-chart-styling" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/marker-options" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/marker-templates" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/overview" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/line-chart-with-legend" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/point-chart-multiple-sources" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/point-chart-styling" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/point-chart-single-source" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/spline-area-multiple-sources" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/spline-area-single-source" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/spline-area-styling" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/spline-multiple-sources" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/spline-single-source" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/spline-styling" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/stack-columns" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/step-area-single-source" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/step-area-multiple-sources" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/step-area-styling" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/step-line-single-source" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/step-line-multiple-sources" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/step-line-styling" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/tooltip-types" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/tooltip-template" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/trendline" },
+  { "browser": false, "xplat": false, "path": "charts/category-chart/value-lines" },
   { "browser": false, "xplat": false, "path": "charts/pie-chart/animation" },
   { "browser": false, "xplat": false, "path": "charts/pie-chart/explosion" },
-  { "browser": false, "xplat": false, "path": "charts/pie-chart/legend" },
   { "browser": false, "xplat": false, "path": "charts/pie-chart/others" },
   { "browser": false, "xplat": false, "path": "charts/pie-chart/overview" },
-  { "browser": false, "xplat": false, "path": "charts/pie-chart/selection" },
   { "browser": false, "xplat": false, "path": "charts/pie-chart/styling" },
-  { "browser": false, "xplat": false, "path": "charts/financial-chart/annotations" },
+  { "browser": false, "xplat": false, "path": "charts/pie-chart/legend" },
+  { "browser": false, "xplat": false, "path": "charts/pie-chart/selection" },
   { "browser": false, "xplat": false, "path": "charts/financial-chart/axis-types" },
+  { "browser": false, "xplat": false, "path": "charts/financial-chart/annotations" },
   { "browser": false, "xplat": false, "path": "charts/financial-chart/data-legend" },
   { "browser": false, "xplat": false, "path": "charts/financial-chart/data-legend-formatting-currency" },
-  { "browser": false, "xplat": false, "path": "charts/financial-chart/data-legend-styling-props" },
   { "browser": false, "xplat": false, "path": "charts/financial-chart/data-tooltip" },
   { "browser": false, "xplat": false, "path": "charts/financial-chart/data-tooltip-formatting-currency" },
+  { "browser": false, "xplat": false, "path": "charts/financial-chart/data-legend-styling-props" },
   { "browser": false, "xplat": false, "path": "charts/financial-chart/data-tooltip-styling-props" },
   { "browser": false, "xplat": false, "path": "charts/financial-chart/high-frequency" },
   { "browser": false, "xplat": false, "path": "charts/financial-chart/high-volume" },
-  { "browser": false, "xplat": false, "path": "charts/financial-chart/indicator-customization" },
   { "browser": false, "xplat": false, "path": "charts/financial-chart/indicator-types" },
   { "browser": false, "xplat": false, "path": "charts/financial-chart/multiple-data" },
+  { "browser": false, "xplat": false, "path": "charts/financial-chart/indicator-customization" },
   { "browser": false, "xplat": false, "path": "charts/financial-chart/multiple-feeds" },
   { "browser": false, "xplat": false, "path": "charts/financial-chart/overview" },
   { "browser": false, "xplat": false, "path": "charts/financial-chart/panes" },
   { "browser": false, "xplat": false, "path": "charts/financial-chart/performance" },
-  { "browser": false, "xplat": false, "path": "charts/financial-chart/scrollbars" },
   { "browser": false, "xplat": false, "path": "charts/financial-chart/stock-index-chart" },
+  { "browser": false, "xplat": false, "path": "charts/financial-chart/scrollbars" },
   { "browser": false, "xplat": false, "path": "charts/financial-chart/styling" },
-  { "browser": false, "xplat": false, "path": "charts/financial-chart/theming" },
   { "browser": false, "xplat": false, "path": "charts/financial-chart/time-based-data" },
+  { "browser": false, "xplat": false, "path": "charts/financial-chart/theming" },
   { "browser": false, "xplat": false, "path": "charts/financial-chart/titles" },
-  { "browser": false, "xplat": false, "path": "charts/financial-chart/tooltip-template" },
   { "browser": false, "xplat": false, "path": "charts/financial-chart/tooltip-types" },
+  { "browser": false, "xplat": false, "path": "charts/financial-chart/tooltip-template" },
   { "browser": false, "xplat": false, "path": "charts/financial-chart/trendlines" },
+  { "browser": false, "xplat": false, "path": "charts/tree-map/events" },
   { "browser": false, "xplat": false, "path": "charts/financial-chart/volume-types" },
-  { "browser": false, "xplat": false, "path": "charts/sparkline/display-area" },
+  { "browser": false, "xplat": false, "path": "charts/tree-map/layout" },
+  { "browser": false, "xplat": false, "path": "charts/tree-map/overview" },
+  { "browser": false, "xplat": false, "path": "charts/tree-map/styling" },
+  { "browser": false, "xplat": false, "path": "charts/toolbar/actions-built-in-category-chart" },
+  { "browser": false, "xplat": false, "path": "charts/toolbar/actions-built-in-data-chart" },
+  { "browser": false, "xplat": false, "path": "charts/toolbar/layout-in-vertical-orientation" },
+  { "browser": false, "xplat": false, "path": "charts/toolbar/theming" },
   { "browser": false, "xplat": false, "path": "charts/sparkline/display-column" },
+  { "browser": false, "xplat": false, "path": "charts/sparkline/display-area" },
+  { "browser": false, "xplat": false, "path": "charts/toolbar/layout-actions-for-data-chart" },
   { "browser": false, "xplat": false, "path": "charts/sparkline/display-lines" },
   { "browser": false, "xplat": false, "path": "charts/sparkline/display-types" },
   { "browser": false, "xplat": false, "path": "charts/sparkline/display-winloss" },
   { "browser": false, "xplat": false, "path": "charts/sparkline/grid" },
   { "browser": false, "xplat": false, "path": "charts/sparkline/markers" },
   { "browser": false, "xplat": false, "path": "charts/sparkline/normal-range" },
-  { "browser": false, "xplat": false, "path": "charts/sparkline/trendlines" },
   { "browser": false, "xplat": false, "path": "charts/sparkline/unknown-values" },
-  { "browser": false, "xplat": false, "path": "charts/toolbar/actions-built-in-category-chart" },
-  { "browser": false, "xplat": false, "path": "charts/toolbar/actions-built-in-data-chart" },
-  { "browser": false, "xplat": false, "path": "charts/toolbar/layout-actions-for-data-chart" },
-  { "browser": false, "xplat": false, "path": "charts/toolbar/layout-in-vertical-orientation" },
-  { "browser": false, "xplat": false, "path": "charts/toolbar/theming" },
-  { "browser": false, "xplat": false, "path": "charts/tree-map/events" },
-  { "browser": false, "xplat": false, "path": "charts/tree-map/layout" },
-  { "browser": false, "xplat": false, "path": "charts/tree-map/overview" },
-  { "browser": false, "xplat": false, "path": "charts/tree-map/styling" },
+  { "browser": false, "xplat": false, "path": "charts/sparkline/trendlines" },
   { "browser": false, "xplat": false, "path": "charts/zoomslider/overview" },
-  { "browser": false, "xplat": false, "path": "excel/excel-library/operations-on-workbooks" },
-  { "browser": false, "xplat": false, "path": "excel/excel-library/operations-on-worksheets" },
-  { "browser": false, "xplat": false, "path": "excel/excel-library/overview" },
-  { "browser": false, "xplat": false, "path": "excel/excel-library/working-with-cells" },
-  { "browser": false, "xplat": false, "path": "excel/excel-library/working-with-charts" },
-  { "browser": false, "xplat": false, "path": "excel/excel-library/working-with-sparklines" },
-  { "browser": false, "xplat": false, "path": "excel/excel-library/working-with-tables" },
-  { "browser": false, "xplat": false, "path": "excel/spreadsheet/activation" },
-  { "browser": false, "xplat": false, "path": "excel/spreadsheet/adapter-chart" },
-  { "browser": false, "xplat": false, "path": "excel/spreadsheet/adapter-combo" },
-  { "browser": false, "xplat": false, "path": "excel/spreadsheet/clipboard" },
-  { "browser": false, "xplat": false, "path": "excel/spreadsheet/commands" },
-  { "browser": false, "xplat": false, "path": "excel/spreadsheet/conditional-formatting" },
-  { "browser": false, "xplat": false, "path": "excel/spreadsheet/config-options" },
-  { "browser": false, "xplat": false, "path": "excel/spreadsheet/data-validation" },
-  { "browser": false, "xplat": false, "path": "excel/spreadsheet/hyperlinks" },
-  { "browser": false, "xplat": false, "path": "excel/spreadsheet/overview" },
-  { "browser": false, "xplat": false, "path": "maps/geo-map/binding-data-csv" },
   { "browser": false, "xplat": false, "path": "maps/geo-map/binding-data-json-points" },
   { "browser": false, "xplat": false, "path": "maps/geo-map/binding-data-model" },
   { "browser": false, "xplat": false, "path": "maps/geo-map/binding-multiple-shapes" },
+  { "browser": false, "xplat": false, "path": "maps/geo-map/binding-data-csv" },
   { "browser": false, "xplat": false, "path": "maps/geo-map/binding-multiple-sources" },
   { "browser": false, "xplat": false, "path": "maps/geo-map/binding-shp-points" },
-  { "browser": false, "xplat": false, "path": "maps/geo-map/binding-shp-polygons" },
   { "browser": false, "xplat": false, "path": "maps/geo-map/binding-shp-polylines" },
+  { "browser": false, "xplat": false, "path": "maps/geo-map/binding-shp-polygons" },
   { "browser": false, "xplat": false, "path": "maps/geo-map/custom-tooltips" },
   { "browser": false, "xplat": false, "path": "maps/geo-map/display-bing-imagery" },
   { "browser": false, "xplat": false, "path": "maps/geo-map/display-esri-imagery" },
@@ -280,34 +265,51 @@
   { "browser": false, "xplat": false, "path": "maps/geo-map/marker-type" },
   { "browser": false, "xplat": false, "path": "maps/geo-map/navigation" },
   { "browser": false, "xplat": false, "path": "maps/geo-map/overview" },
-  { "browser": false, "xplat": false, "path": "maps/geo-map/shape-styling" },
   { "browser": false, "xplat": false, "path": "maps/geo-map/triangulating-data" },
+  { "browser": false, "xplat": false, "path": "maps/geo-map/shape-styling" },
   { "browser": false, "xplat": false, "path": "maps/geo-map/type-scatter-area-series" },
   { "browser": false, "xplat": false, "path": "maps/geo-map/type-scatter-bubble-series" },
-  { "browser": false, "xplat": false, "path": "maps/geo-map/type-scatter-contour-series" },
   { "browser": false, "xplat": false, "path": "maps/geo-map/type-scatter-density-series" },
-  { "browser": false, "xplat": false, "path": "maps/geo-map/type-scatter-symbol-series" },
+  { "browser": false, "xplat": false, "path": "maps/geo-map/type-scatter-contour-series" },
   { "browser": false, "xplat": false, "path": "maps/geo-map/type-shape-polygon-series" },
+  { "browser": false, "xplat": false, "path": "maps/geo-map/type-scatter-symbol-series" },
   { "browser": false, "xplat": false, "path": "maps/geo-map/type-shape-polyline-series" },
   { "browser": false, "xplat": false, "path": "gauges/bullet-graph/animation" },
   { "browser": false, "xplat": false, "path": "gauges/bullet-graph/background" },
   { "browser": false, "xplat": false, "path": "gauges/bullet-graph/labels" },
   { "browser": false, "xplat": false, "path": "gauges/bullet-graph/measures" },
-  { "browser": false, "xplat": false, "path": "gauges/bullet-graph/ranges" },
   { "browser": false, "xplat": false, "path": "gauges/bullet-graph/scale" },
   { "browser": false, "xplat": false, "path": "gauges/bullet-graph/tickmarks" },
+  { "browser": false, "xplat": false, "path": "excel/spreadsheet/activation" },
+  { "browser": false, "xplat": false, "path": "excel/spreadsheet/adapter-chart" },
+  { "browser": false, "xplat": false, "path": "gauges/bullet-graph/ranges" },
+  { "browser": false, "xplat": false, "path": "excel/spreadsheet/adapter-combo" },
+  { "browser": false, "xplat": false, "path": "excel/spreadsheet/clipboard" },
+  { "browser": false, "xplat": false, "path": "excel/spreadsheet/commands" },
+  { "browser": false, "xplat": false, "path": "excel/spreadsheet/conditional-formatting" },
+  { "browser": false, "xplat": false, "path": "excel/spreadsheet/config-options" },
+  { "browser": false, "xplat": false, "path": "excel/spreadsheet/data-validation" },
+  { "browser": false, "xplat": false, "path": "excel/spreadsheet/hyperlinks" },
+  { "browser": false, "xplat": false, "path": "excel/excel-library/operations-on-workbooks" },
+  { "browser": false, "xplat": false, "path": "excel/excel-library/operations-on-worksheets" },
+  { "browser": false, "xplat": false, "path": "excel/excel-library/overview" },
+  { "browser": false, "xplat": false, "path": "excel/spreadsheet/overview" },
+  { "browser": false, "xplat": false, "path": "excel/excel-library/working-with-cells" },
+  { "browser": false, "xplat": false, "path": "excel/excel-library/working-with-charts" },
+  { "browser": false, "xplat": false, "path": "excel/excel-library/working-with-sparklines" },
+  { "browser": false, "xplat": false, "path": "excel/excel-library/working-with-tables" },
   { "browser": false, "xplat": false, "path": "gauges/linear-gauge/animation" },
-  { "browser": false, "xplat": false, "path": "gauges/linear-gauge/backing" },
   { "browser": false, "xplat": false, "path": "gauges/linear-gauge/labels" },
   { "browser": false, "xplat": false, "path": "gauges/linear-gauge/needle" },
+  { "browser": false, "xplat": false, "path": "gauges/linear-gauge/backing" },
   { "browser": false, "xplat": false, "path": "gauges/linear-gauge/ranges" },
   { "browser": false, "xplat": false, "path": "gauges/linear-gauge/scale" },
   { "browser": false, "xplat": false, "path": "gauges/linear-gauge/tickmarks" },
   { "browser": false, "xplat": false, "path": "gauges/radial-gauge/animation" },
-  { "browser": false, "xplat": false, "path": "gauges/radial-gauge/backing" },
-  { "browser": false, "xplat": false, "path": "gauges/radial-gauge/labels" },
   { "browser": false, "xplat": false, "path": "gauges/radial-gauge/needle" },
+  { "browser": false, "xplat": false, "path": "gauges/radial-gauge/backing" },
   { "browser": false, "xplat": false, "path": "gauges/radial-gauge/ranges" },
+  { "browser": false, "xplat": false, "path": "gauges/radial-gauge/labels" },
   { "browser": false, "xplat": false, "path": "gauges/radial-gauge/scale" },
   { "browser": false, "xplat": false, "path": "gauges/radial-gauge/tickmarks" }
 ]
\ No newline at end of file
diff --git a/browser/src/browser-info.json b/browser/src/browser-info.json
index c425a4eee..d2b9164bc 100644
--- a/browser/src/browser-info.json
+++ b/browser/src/browser-info.json
@@ -1,14 +1,14 @@
 [
 {"ver":"16.0.7","name":"igniteui-angular"},
 {"ver":"1.4.14","name":"igniteui-theming"},
-{"ver":"16.1.0","name":"igniteui-angular-core"},
-{"ver":"16.1.0","name":"igniteui-angular-charts"},
-{"ver":"16.1.0","name":"igniteui-angular-excel"},
-{"ver":"16.1.0","name":"igniteui-angular-gauges"},
-{"ver":"16.1.0","name":"igniteui-angular-inputs"},
-{"ver":"16.1.0","name":"igniteui-angular-layouts"},
-{"ver":"16.1.0","name":"igniteui-angular-maps"},
-{"ver":"16.1.0","name":"igniteui-angular-spreadsheet"},
-{"ver":"16.1.0","name":"igniteui-angular-spreadsheet-chart-adapter"},
+{"ver":"23.2.18","name":"igniteui-angular-core"},
+{"ver":"23.2.18","name":"igniteui-angular-charts"},
+{"ver":"23.2.18","name":"igniteui-angular-excel"},
+{"ver":"23.2.18","name":"igniteui-angular-gauges"},
+{"ver":"23.2.18","name":"igniteui-angular-inputs"},
+{"ver":"23.2.18","name":"igniteui-angular-layouts"},
+{"ver":"23.2.18","name":"igniteui-angular-maps"},
+{"ver":"23.2.18","name":"igniteui-angular-spreadsheet"},
+{"ver":"23.2.18","name":"igniteui-angular-spreadsheet-chart-adapter"},
 {"ver":"4.3.0-beta.0","name":"igniteui-webcomponents"}
 ]
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index d4c14b00c..000000000
--- a/package-lock.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "igniteui-angular-examples",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {}
-}
diff --git a/samples/charts/category-chart/annotations-all/package.json b/samples/charts/category-chart/annotations-all/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/category-chart/annotations-all/package.json
+++ b/samples/charts/category-chart/annotations-all/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/category-chart/annotations-callouts/package.json b/samples/charts/category-chart/annotations-callouts/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/category-chart/annotations-callouts/package.json
+++ b/samples/charts/category-chart/annotations-callouts/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/category-chart/annotations-crosshairs/package.json b/samples/charts/category-chart/annotations-crosshairs/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/category-chart/annotations-crosshairs/package.json
+++ b/samples/charts/category-chart/annotations-crosshairs/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/category-chart/annotations-custom/package.json b/samples/charts/category-chart/annotations-custom/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/category-chart/annotations-custom/package.json
+++ b/samples/charts/category-chart/annotations-custom/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/category-chart/annotations-final-value/package.json b/samples/charts/category-chart/annotations-final-value/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/category-chart/annotations-final-value/package.json
+++ b/samples/charts/category-chart/annotations-final-value/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/category-chart/annotations-highlighting/package.json b/samples/charts/category-chart/annotations-highlighting/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/category-chart/annotations-highlighting/package.json
+++ b/samples/charts/category-chart/annotations-highlighting/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/category-chart/annotations/package.json b/samples/charts/category-chart/annotations/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/category-chart/annotations/package.json
+++ b/samples/charts/category-chart/annotations/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/annotations/src/app/app.module.ts b/samples/charts/category-chart/annotations/src/app/app.module.ts
index 35828e100..a3bbccb9f 100644
--- a/samples/charts/category-chart/annotations/src/app/app.module.ts
+++ b/samples/charts/category-chart/annotations/src/app/app.module.ts
@@ -23,7 +23,6 @@ import { IgxCategoryChartModule, IgxLegendModule } from "igniteui-angular-charts
     IgxLegendModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/category-chart/area-chart-multiple-sources/package.json b/samples/charts/category-chart/area-chart-multiple-sources/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/area-chart-multiple-sources/package.json
+++ b/samples/charts/category-chart/area-chart-multiple-sources/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/area-chart-single-source/package.json b/samples/charts/category-chart/area-chart-single-source/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/area-chart-single-source/package.json
+++ b/samples/charts/category-chart/area-chart-single-source/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/area-chart-styling/package.json b/samples/charts/category-chart/area-chart-styling/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/area-chart-styling/package.json
+++ b/samples/charts/category-chart/area-chart-styling/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/axis-gap/package.json b/samples/charts/category-chart/axis-gap/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/category-chart/axis-gap/package.json
+++ b/samples/charts/category-chart/axis-gap/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/category-chart/axis-gridlines/package.json b/samples/charts/category-chart/axis-gridlines/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/category-chart/axis-gridlines/package.json
+++ b/samples/charts/category-chart/axis-gridlines/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/category-chart/axis-inverted/package.json b/samples/charts/category-chart/axis-inverted/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/category-chart/axis-inverted/package.json
+++ b/samples/charts/category-chart/axis-inverted/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/category-chart/axis-labels/package.json b/samples/charts/category-chart/axis-labels/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/category-chart/axis-labels/package.json
+++ b/samples/charts/category-chart/axis-labels/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/category-chart/axis-locations/package.json b/samples/charts/category-chart/axis-locations/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/category-chart/axis-locations/package.json
+++ b/samples/charts/category-chart/axis-locations/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/category-chart/axis-options/package.json b/samples/charts/category-chart/axis-options/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/axis-options/package.json
+++ b/samples/charts/category-chart/axis-options/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/axis-overlap/package.json b/samples/charts/category-chart/axis-overlap/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/category-chart/axis-overlap/package.json
+++ b/samples/charts/category-chart/axis-overlap/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/category-chart/axis-range/package.json b/samples/charts/category-chart/axis-range/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/category-chart/axis-range/package.json
+++ b/samples/charts/category-chart/axis-range/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/category-chart/axis-tickmarks/package.json b/samples/charts/category-chart/axis-tickmarks/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/category-chart/axis-tickmarks/package.json
+++ b/samples/charts/category-chart/axis-tickmarks/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/category-chart/axis-titles/package.json b/samples/charts/category-chart/axis-titles/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/axis-titles/package.json
+++ b/samples/charts/category-chart/axis-titles/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/column-chart-multiple-sources/package.json b/samples/charts/category-chart/column-chart-multiple-sources/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/column-chart-multiple-sources/package.json
+++ b/samples/charts/category-chart/column-chart-multiple-sources/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/column-chart-single-source/package.json b/samples/charts/category-chart/column-chart-single-source/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/column-chart-single-source/package.json
+++ b/samples/charts/category-chart/column-chart-single-source/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/column-chart-styling/package.json b/samples/charts/category-chart/column-chart-styling/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/column-chart-styling/package.json
+++ b/samples/charts/category-chart/column-chart-styling/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/column-chart-with-highlighting/package.json b/samples/charts/category-chart/column-chart-with-highlighting/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/category-chart/column-chart-with-highlighting/package.json
+++ b/samples/charts/category-chart/column-chart-with-highlighting/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/column-chart-with-highlighting/src/app/app.module.ts b/samples/charts/category-chart/column-chart-with-highlighting/src/app/app.module.ts
index 35828e100..a3bbccb9f 100644
--- a/samples/charts/category-chart/column-chart-with-highlighting/src/app/app.module.ts
+++ b/samples/charts/category-chart/column-chart-with-highlighting/src/app/app.module.ts
@@ -23,7 +23,6 @@ import { IgxCategoryChartModule, IgxLegendModule } from "igniteui-angular-charts
     IgxLegendModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/category-chart/column-chart-with-tooltips/package.json b/samples/charts/category-chart/column-chart-with-tooltips/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/category-chart/column-chart-with-tooltips/package.json
+++ b/samples/charts/category-chart/column-chart-with-tooltips/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/category-chart/data-aggregations/package.json b/samples/charts/category-chart/data-aggregations/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/category-chart/data-aggregations/package.json
+++ b/samples/charts/category-chart/data-aggregations/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/category-chart/data-legend-formatting-decimals/package.json b/samples/charts/category-chart/data-legend-formatting-decimals/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/data-legend-formatting-decimals/package.json
+++ b/samples/charts/category-chart/data-legend-formatting-decimals/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/data-legend/package.json b/samples/charts/category-chart/data-legend/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/data-legend/package.json
+++ b/samples/charts/category-chart/data-legend/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/data-tooltip-formatting-decimals/package.json b/samples/charts/category-chart/data-tooltip-formatting-decimals/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/data-tooltip-formatting-decimals/package.json
+++ b/samples/charts/category-chart/data-tooltip-formatting-decimals/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/data-tooltip-positioning/package.json b/samples/charts/category-chart/data-tooltip-positioning/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/category-chart/data-tooltip-positioning/package.json
+++ b/samples/charts/category-chart/data-tooltip-positioning/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/category-chart/data-tooltip/package.json b/samples/charts/category-chart/data-tooltip/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/data-tooltip/package.json
+++ b/samples/charts/category-chart/data-tooltip/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/high-frequency/package.json b/samples/charts/category-chart/high-frequency/package.json
index 0a49f3cd0..e1b63b3e7 100644
--- a/samples/charts/category-chart/high-frequency/package.json
+++ b/samples/charts/category-chart/high-frequency/package.json
@@ -19,8 +19,8 @@
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
     "igniteui-angular": "16.0.7",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/high-frequency/src/app/app.module.ts b/samples/charts/category-chart/high-frequency/src/app/app.module.ts
index 747153d8f..137fbbd82 100644
--- a/samples/charts/category-chart/high-frequency/src/app/app.module.ts
+++ b/samples/charts/category-chart/high-frequency/src/app/app.module.ts
@@ -25,7 +25,6 @@ import { IgxSliderModule } from "igniteui-angular";
     IgxSliderModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/category-chart/high-volume/package.json b/samples/charts/category-chart/high-volume/package.json
index 0a49f3cd0..e1b63b3e7 100644
--- a/samples/charts/category-chart/high-volume/package.json
+++ b/samples/charts/category-chart/high-volume/package.json
@@ -19,8 +19,8 @@
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
     "igniteui-angular": "16.0.7",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/high-volume/src/app/app.module.ts b/samples/charts/category-chart/high-volume/src/app/app.module.ts
index 747153d8f..137fbbd82 100644
--- a/samples/charts/category-chart/high-volume/src/app/app.module.ts
+++ b/samples/charts/category-chart/high-volume/src/app/app.module.ts
@@ -25,7 +25,6 @@ import { IgxSliderModule } from "igniteui-angular";
     IgxSliderModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/category-chart/highlighting/package.json b/samples/charts/category-chart/highlighting/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/category-chart/highlighting/package.json
+++ b/samples/charts/category-chart/highlighting/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/highlighting/src/app/app.module.ts b/samples/charts/category-chart/highlighting/src/app/app.module.ts
index 35828e100..a3bbccb9f 100644
--- a/samples/charts/category-chart/highlighting/src/app/app.module.ts
+++ b/samples/charts/category-chart/highlighting/src/app/app.module.ts
@@ -23,7 +23,6 @@ import { IgxCategoryChartModule, IgxLegendModule } from "igniteui-angular-charts
     IgxLegendModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/category-chart/line-chart-multiple-sources/package.json b/samples/charts/category-chart/line-chart-multiple-sources/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/line-chart-multiple-sources/package.json
+++ b/samples/charts/category-chart/line-chart-multiple-sources/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/line-chart-single-source/package.json b/samples/charts/category-chart/line-chart-single-source/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/line-chart-single-source/package.json
+++ b/samples/charts/category-chart/line-chart-single-source/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/line-chart-styling/package.json b/samples/charts/category-chart/line-chart-styling/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/line-chart-styling/package.json
+++ b/samples/charts/category-chart/line-chart-styling/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/line-chart-with-animations/package.json b/samples/charts/category-chart/line-chart-with-animations/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/category-chart/line-chart-with-animations/package.json
+++ b/samples/charts/category-chart/line-chart-with-animations/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/line-chart-with-animations/src/app/app.module.ts b/samples/charts/category-chart/line-chart-with-animations/src/app/app.module.ts
index 35828e100..a3bbccb9f 100644
--- a/samples/charts/category-chart/line-chart-with-animations/src/app/app.module.ts
+++ b/samples/charts/category-chart/line-chart-with-animations/src/app/app.module.ts
@@ -23,7 +23,6 @@ import { IgxCategoryChartModule, IgxLegendModule } from "igniteui-angular-charts
     IgxLegendModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/category-chart/line-chart-with-annotations/package.json b/samples/charts/category-chart/line-chart-with-annotations/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/category-chart/line-chart-with-annotations/package.json
+++ b/samples/charts/category-chart/line-chart-with-annotations/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/line-chart-with-annotations/src/app/app.module.ts b/samples/charts/category-chart/line-chart-with-annotations/src/app/app.module.ts
index 35828e100..a3bbccb9f 100644
--- a/samples/charts/category-chart/line-chart-with-annotations/src/app/app.module.ts
+++ b/samples/charts/category-chart/line-chart-with-annotations/src/app/app.module.ts
@@ -23,7 +23,6 @@ import { IgxCategoryChartModule, IgxLegendModule } from "igniteui-angular-charts
     IgxLegendModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/category-chart/line-chart-with-legend/package.json b/samples/charts/category-chart/line-chart-with-legend/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/category-chart/line-chart-with-legend/package.json
+++ b/samples/charts/category-chart/line-chart-with-legend/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/line-chart-with-legend/src/app/app.module.ts b/samples/charts/category-chart/line-chart-with-legend/src/app/app.module.ts
index 35828e100..a3bbccb9f 100644
--- a/samples/charts/category-chart/line-chart-with-legend/src/app/app.module.ts
+++ b/samples/charts/category-chart/line-chart-with-legend/src/app/app.module.ts
@@ -23,7 +23,6 @@ import { IgxCategoryChartModule, IgxLegendModule } from "igniteui-angular-charts
     IgxLegendModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/category-chart/marker-options/package.json b/samples/charts/category-chart/marker-options/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/category-chart/marker-options/package.json
+++ b/samples/charts/category-chart/marker-options/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/category-chart/marker-templates/package.json b/samples/charts/category-chart/marker-templates/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/category-chart/marker-templates/package.json
+++ b/samples/charts/category-chart/marker-templates/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/marker-templates/src/app/app.module.ts b/samples/charts/category-chart/marker-templates/src/app/app.module.ts
index 35828e100..a3bbccb9f 100644
--- a/samples/charts/category-chart/marker-templates/src/app/app.module.ts
+++ b/samples/charts/category-chart/marker-templates/src/app/app.module.ts
@@ -23,7 +23,6 @@ import { IgxCategoryChartModule, IgxLegendModule } from "igniteui-angular-charts
     IgxLegendModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/category-chart/overview/package.json b/samples/charts/category-chart/overview/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/overview/package.json
+++ b/samples/charts/category-chart/overview/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/point-chart-multiple-sources/package.json b/samples/charts/category-chart/point-chart-multiple-sources/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/point-chart-multiple-sources/package.json
+++ b/samples/charts/category-chart/point-chart-multiple-sources/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/point-chart-single-source/package.json b/samples/charts/category-chart/point-chart-single-source/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/point-chart-single-source/package.json
+++ b/samples/charts/category-chart/point-chart-single-source/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/point-chart-styling/package.json b/samples/charts/category-chart/point-chart-styling/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/point-chart-styling/package.json
+++ b/samples/charts/category-chart/point-chart-styling/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/spline-area-multiple-sources/package.json b/samples/charts/category-chart/spline-area-multiple-sources/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/spline-area-multiple-sources/package.json
+++ b/samples/charts/category-chart/spline-area-multiple-sources/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/spline-area-single-source/package.json b/samples/charts/category-chart/spline-area-single-source/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/spline-area-single-source/package.json
+++ b/samples/charts/category-chart/spline-area-single-source/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/spline-area-styling/package.json b/samples/charts/category-chart/spline-area-styling/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/spline-area-styling/package.json
+++ b/samples/charts/category-chart/spline-area-styling/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/spline-multiple-sources/package.json b/samples/charts/category-chart/spline-multiple-sources/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/spline-multiple-sources/package.json
+++ b/samples/charts/category-chart/spline-multiple-sources/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/spline-single-source/package.json b/samples/charts/category-chart/spline-single-source/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/spline-single-source/package.json
+++ b/samples/charts/category-chart/spline-single-source/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/spline-styling/package.json b/samples/charts/category-chart/spline-styling/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/spline-styling/package.json
+++ b/samples/charts/category-chart/spline-styling/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/stack-columns/package.json b/samples/charts/category-chart/stack-columns/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/category-chart/stack-columns/package.json
+++ b/samples/charts/category-chart/stack-columns/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/stack-columns/src/app/app.module.ts b/samples/charts/category-chart/stack-columns/src/app/app.module.ts
index 35828e100..a3bbccb9f 100644
--- a/samples/charts/category-chart/stack-columns/src/app/app.module.ts
+++ b/samples/charts/category-chart/stack-columns/src/app/app.module.ts
@@ -23,7 +23,6 @@ import { IgxCategoryChartModule, IgxLegendModule } from "igniteui-angular-charts
     IgxLegendModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/category-chart/step-area-multiple-sources/package.json b/samples/charts/category-chart/step-area-multiple-sources/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/step-area-multiple-sources/package.json
+++ b/samples/charts/category-chart/step-area-multiple-sources/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/step-area-single-source/package.json b/samples/charts/category-chart/step-area-single-source/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/step-area-single-source/package.json
+++ b/samples/charts/category-chart/step-area-single-source/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/step-area-styling/package.json b/samples/charts/category-chart/step-area-styling/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/step-area-styling/package.json
+++ b/samples/charts/category-chart/step-area-styling/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/step-line-multiple-sources/package.json b/samples/charts/category-chart/step-line-multiple-sources/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/step-line-multiple-sources/package.json
+++ b/samples/charts/category-chart/step-line-multiple-sources/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/step-line-single-source/package.json b/samples/charts/category-chart/step-line-single-source/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/step-line-single-source/package.json
+++ b/samples/charts/category-chart/step-line-single-source/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/step-line-styling/package.json b/samples/charts/category-chart/step-line-styling/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/category-chart/step-line-styling/package.json
+++ b/samples/charts/category-chart/step-line-styling/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/tooltip-template/package.json b/samples/charts/category-chart/tooltip-template/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/category-chart/tooltip-template/package.json
+++ b/samples/charts/category-chart/tooltip-template/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/tooltip-template/src/app/app.module.ts b/samples/charts/category-chart/tooltip-template/src/app/app.module.ts
index 35828e100..a3bbccb9f 100644
--- a/samples/charts/category-chart/tooltip-template/src/app/app.module.ts
+++ b/samples/charts/category-chart/tooltip-template/src/app/app.module.ts
@@ -23,7 +23,6 @@ import { IgxCategoryChartModule, IgxLegendModule } from "igniteui-angular-charts
     IgxLegendModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/category-chart/tooltip-types/package.json b/samples/charts/category-chart/tooltip-types/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/category-chart/tooltip-types/package.json
+++ b/samples/charts/category-chart/tooltip-types/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/tooltip-types/src/app/app.module.ts b/samples/charts/category-chart/tooltip-types/src/app/app.module.ts
index 35828e100..a3bbccb9f 100644
--- a/samples/charts/category-chart/tooltip-types/src/app/app.module.ts
+++ b/samples/charts/category-chart/tooltip-types/src/app/app.module.ts
@@ -23,7 +23,6 @@ import { IgxCategoryChartModule, IgxLegendModule } from "igniteui-angular-charts
     IgxLegendModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/category-chart/trendline/package.json b/samples/charts/category-chart/trendline/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/category-chart/trendline/package.json
+++ b/samples/charts/category-chart/trendline/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/category-chart/trendline/src/app/app.module.ts b/samples/charts/category-chart/trendline/src/app/app.module.ts
index 35828e100..a3bbccb9f 100644
--- a/samples/charts/category-chart/trendline/src/app/app.module.ts
+++ b/samples/charts/category-chart/trendline/src/app/app.module.ts
@@ -23,7 +23,6 @@ import { IgxCategoryChartModule, IgxLegendModule } from "igniteui-angular-charts
     IgxLegendModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/category-chart/value-lines/package.json b/samples/charts/category-chart/value-lines/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/category-chart/value-lines/package.json
+++ b/samples/charts/category-chart/value-lines/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/data-chart/annotations-custom/package.json b/samples/charts/data-chart/annotations-custom/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/annotations-custom/package.json
+++ b/samples/charts/data-chart/annotations-custom/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/axis-annotations-corner-radius/package.json b/samples/charts/data-chart/axis-annotations-corner-radius/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/axis-annotations-corner-radius/package.json
+++ b/samples/charts/data-chart/axis-annotations-corner-radius/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/axis-annotations/package.json b/samples/charts/data-chart/axis-annotations/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/axis-annotations/package.json
+++ b/samples/charts/data-chart/axis-annotations/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/axis-annotations/src/app/app.module.ts b/samples/charts/data-chart/axis-annotations/src/app/app.module.ts
index afa2a0730..8fa60482a 100644
--- a/samples/charts/data-chart/axis-annotations/src/app/app.module.ts
+++ b/samples/charts/data-chart/axis-annotations/src/app/app.module.ts
@@ -29,7 +29,6 @@ import { IgxDataChartCoreModule, IgxDataChartCategoryModule, IgxLegendModule, Ig
     IgxCrosshairLayerModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/axis-crossing/package.json b/samples/charts/data-chart/axis-crossing/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/axis-crossing/package.json
+++ b/samples/charts/data-chart/axis-crossing/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/axis-crossing/src/app/app.module.ts b/samples/charts/data-chart/axis-crossing/src/app/app.module.ts
index f1fb2fc72..2b5738e95 100644
--- a/samples/charts/data-chart/axis-crossing/src/app/app.module.ts
+++ b/samples/charts/data-chart/axis-crossing/src/app/app.module.ts
@@ -25,7 +25,6 @@ import { IgxDataChartCoreModule, IgxDataChartCategoryModule, IgxDataChartScatter
     IgxLegendModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/axis-label-rotation/package.json b/samples/charts/data-chart/axis-label-rotation/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/data-chart/axis-label-rotation/package.json
+++ b/samples/charts/data-chart/axis-label-rotation/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/data-chart/axis-locations/package.json b/samples/charts/data-chart/axis-locations/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/axis-locations/package.json
+++ b/samples/charts/data-chart/axis-locations/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/axis-locations/src/app/app.module.ts b/samples/charts/data-chart/axis-locations/src/app/app.module.ts
index 1f5cf909d..47f3c2d1c 100644
--- a/samples/charts/data-chart/axis-locations/src/app/app.module.ts
+++ b/samples/charts/data-chart/axis-locations/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDataChartCoreModule, IgxDataChartCategoryModule, IgxLegendModule } f
     IgxLegendModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/axis-min-max-gap/package.json b/samples/charts/data-chart/axis-min-max-gap/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/axis-min-max-gap/package.json
+++ b/samples/charts/data-chart/axis-min-max-gap/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/axis-settings/package.json b/samples/charts/data-chart/axis-settings/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/axis-settings/package.json
+++ b/samples/charts/data-chart/axis-settings/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/axis-settings/src/app/app.module.ts b/samples/charts/data-chart/axis-settings/src/app/app.module.ts
index b489dd5b2..792ca7cae 100644
--- a/samples/charts/data-chart/axis-settings/src/app/app.module.ts
+++ b/samples/charts/data-chart/axis-settings/src/app/app.module.ts
@@ -26,7 +26,6 @@ import { SharedData } from "./SharedData";
     IgxNumberAbbreviatorModule
 ],
   providers: [SharedData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/axis-sharing/package.json b/samples/charts/data-chart/axis-sharing/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/axis-sharing/package.json
+++ b/samples/charts/data-chart/axis-sharing/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/axis-sharing/src/app/app.module.ts b/samples/charts/data-chart/axis-sharing/src/app/app.module.ts
index 6930ae32b..2b3dd1fd5 100644
--- a/samples/charts/data-chart/axis-sharing/src/app/app.module.ts
+++ b/samples/charts/data-chart/axis-sharing/src/app/app.module.ts
@@ -29,7 +29,6 @@ import { SampleFinancialData } from "./SampleFinancialData";
     IgxFinancialPriceSeriesModule
 ],
   providers: [SampleFinancialData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/axis-types/package.json b/samples/charts/data-chart/axis-types/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/axis-types/package.json
+++ b/samples/charts/data-chart/axis-types/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/axis-types/src/app/app.module.ts b/samples/charts/data-chart/axis-types/src/app/app.module.ts
index a5ca0a474..df3035a03 100644
--- a/samples/charts/data-chart/axis-types/src/app/app.module.ts
+++ b/samples/charts/data-chart/axis-types/src/app/app.module.ts
@@ -41,7 +41,6 @@ import { SampleScatterData } from "./SampleScatterData";
     SampleCategoryData,
     SampleScatterData
 ],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/bar-chart-multiple-sources/package.json b/samples/charts/data-chart/bar-chart-multiple-sources/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/bar-chart-multiple-sources/package.json
+++ b/samples/charts/data-chart/bar-chart-multiple-sources/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/bar-chart-overlapping/package.json b/samples/charts/data-chart/bar-chart-overlapping/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/bar-chart-overlapping/package.json
+++ b/samples/charts/data-chart/bar-chart-overlapping/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/bar-chart-single-source/package.json b/samples/charts/data-chart/bar-chart-single-source/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/bar-chart-single-source/package.json
+++ b/samples/charts/data-chart/bar-chart-single-source/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/bar-chart-styling/package.json b/samples/charts/data-chart/bar-chart-styling/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/bar-chart-styling/package.json
+++ b/samples/charts/data-chart/bar-chart-styling/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/callout-layer-styling/package.json b/samples/charts/data-chart/callout-layer-styling/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/callout-layer-styling/package.json
+++ b/samples/charts/data-chart/callout-layer-styling/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/chart-navigation/package.json b/samples/charts/data-chart/chart-navigation/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/chart-navigation/package.json
+++ b/samples/charts/data-chart/chart-navigation/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/chart-navigation/src/app/app.module.ts b/samples/charts/data-chart/chart-navigation/src/app/app.module.ts
index b5f2a4d6d..24f3f413b 100644
--- a/samples/charts/data-chart/chart-navigation/src/app/app.module.ts
+++ b/samples/charts/data-chart/chart-navigation/src/app/app.module.ts
@@ -28,7 +28,6 @@ import { SampleScatterStats } from "./SampleScatterStats";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleScatterStats],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/chart-overview/package.json b/samples/charts/data-chart/chart-overview/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/chart-overview/package.json
+++ b/samples/charts/data-chart/chart-overview/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/chart-overview/src/app/app.module.ts b/samples/charts/data-chart/chart-overview/src/app/app.module.ts
index da5e3d70c..950e0c72c 100644
--- a/samples/charts/data-chart/chart-overview/src/app/app.module.ts
+++ b/samples/charts/data-chart/chart-overview/src/app/app.module.ts
@@ -28,7 +28,6 @@ import { SampleScatterStats } from "./SampleScatterStats";
     IgxLegendModule
 ],
   providers: [SampleScatterStats],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/chart-performance/package.json b/samples/charts/data-chart/chart-performance/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/chart-performance/package.json
+++ b/samples/charts/data-chart/chart-performance/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/chart-performance/src/app/app.module.ts b/samples/charts/data-chart/chart-performance/src/app/app.module.ts
index a847b948f..8e42838f1 100644
--- a/samples/charts/data-chart/chart-performance/src/app/app.module.ts
+++ b/samples/charts/data-chart/chart-performance/src/app/app.module.ts
@@ -25,7 +25,6 @@ import { SharedData } from "./SharedData";
     IgxLegendModule
 ],
   providers: [SharedData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/chart-synchronization/package.json b/samples/charts/data-chart/chart-synchronization/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/chart-synchronization/package.json
+++ b/samples/charts/data-chart/chart-synchronization/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/chart-synchronization/src/app/app.module.ts b/samples/charts/data-chart/chart-synchronization/src/app/app.module.ts
index fc05bf570..d7d879db4 100644
--- a/samples/charts/data-chart/chart-synchronization/src/app/app.module.ts
+++ b/samples/charts/data-chart/chart-synchronization/src/app/app.module.ts
@@ -26,7 +26,6 @@ import { SharedData } from "./SharedData";
     IgxDataChartInteractivityModule
 ],
   providers: [SharedData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/chart-titles/package.json b/samples/charts/data-chart/chart-titles/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/chart-titles/package.json
+++ b/samples/charts/data-chart/chart-titles/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/chart-titles/src/app/app.module.ts b/samples/charts/data-chart/chart-titles/src/app/app.module.ts
index a847b948f..8e42838f1 100644
--- a/samples/charts/data-chart/chart-titles/src/app/app.module.ts
+++ b/samples/charts/data-chart/chart-titles/src/app/app.module.ts
@@ -25,7 +25,6 @@ import { SharedData } from "./SharedData";
     IgxLegendModule
 ],
   providers: [SharedData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/column-chart-styling/package.json b/samples/charts/data-chart/column-chart-styling/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/column-chart-styling/package.json
+++ b/samples/charts/data-chart/column-chart-styling/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/column-chart-styling/src/app/app.module.ts b/samples/charts/data-chart/column-chart-styling/src/app/app.module.ts
index a55521477..13856e294 100644
--- a/samples/charts/data-chart/column-chart-styling/src/app/app.module.ts
+++ b/samples/charts/data-chart/column-chart-styling/src/app/app.module.ts
@@ -25,7 +25,6 @@ import { IgxDataChartCoreModule, IgxDataChartCategoryModule, IgxLegendModule, Ig
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/composite-chart/package.json b/samples/charts/data-chart/composite-chart/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/composite-chart/package.json
+++ b/samples/charts/data-chart/composite-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/composite-chart/src/app/app.module.ts b/samples/charts/data-chart/composite-chart/src/app/app.module.ts
index 5d8b77563..6ab92a90c 100644
--- a/samples/charts/data-chart/composite-chart/src/app/app.module.ts
+++ b/samples/charts/data-chart/composite-chart/src/app/app.module.ts
@@ -29,7 +29,6 @@ import { IgxDataChartCoreModule, IgxDataChartCategoryModule, IgxLegendModule, Ig
     IgxNumberAbbreviatorModule,
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/crosshair-layer-styling/package.json b/samples/charts/data-chart/crosshair-layer-styling/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/crosshair-layer-styling/package.json
+++ b/samples/charts/data-chart/crosshair-layer-styling/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/crosshair-layer-styling/src/app/app.module.ts b/samples/charts/data-chart/crosshair-layer-styling/src/app/app.module.ts
index 3353b248c..58d0f5427 100644
--- a/samples/charts/data-chart/crosshair-layer-styling/src/app/app.module.ts
+++ b/samples/charts/data-chart/crosshair-layer-styling/src/app/app.module.ts
@@ -27,7 +27,6 @@ import { IgxDataChartCoreModule, IgxDataChartCategoryModule, IgxLegendModule, Ig
     IgxCrosshairLayerModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/dash-array-axes/package.json b/samples/charts/data-chart/dash-array-axes/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/dash-array-axes/package.json
+++ b/samples/charts/data-chart/dash-array-axes/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/dash-array-series/package.json b/samples/charts/data-chart/dash-array-series/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/dash-array-series/package.json
+++ b/samples/charts/data-chart/dash-array-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/dash-array-tickmarks/package.json b/samples/charts/data-chart/dash-array-tickmarks/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/dash-array-tickmarks/package.json
+++ b/samples/charts/data-chart/dash-array-tickmarks/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/dash-array-trendline/package.json b/samples/charts/data-chart/dash-array-trendline/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/dash-array-trendline/package.json
+++ b/samples/charts/data-chart/dash-array-trendline/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/data-legend/package.json b/samples/charts/data-chart/data-legend/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/data-legend/package.json
+++ b/samples/charts/data-chart/data-legend/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/data-tooltip/package.json b/samples/charts/data-chart/data-tooltip/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/data-tooltip/package.json
+++ b/samples/charts/data-chart/data-tooltip/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/final-value-layer-styling/package.json b/samples/charts/data-chart/final-value-layer-styling/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/final-value-layer-styling/package.json
+++ b/samples/charts/data-chart/final-value-layer-styling/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/final-value-layer-styling/src/app/app.module.ts b/samples/charts/data-chart/final-value-layer-styling/src/app/app.module.ts
index 7d2bd458c..166ebf3aa 100644
--- a/samples/charts/data-chart/final-value-layer-styling/src/app/app.module.ts
+++ b/samples/charts/data-chart/final-value-layer-styling/src/app/app.module.ts
@@ -27,7 +27,6 @@ import { IgxDataChartCoreModule, IgxDataChartCategoryModule, IgxLegendModule, Ig
     IgxFinalValueLayerModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/financial-price-series/package.json b/samples/charts/data-chart/financial-price-series/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/financial-price-series/package.json
+++ b/samples/charts/data-chart/financial-price-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/legends/package.json b/samples/charts/data-chart/legends/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/legends/package.json
+++ b/samples/charts/data-chart/legends/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/legends/src/app/app.module.ts b/samples/charts/data-chart/legends/src/app/app.module.ts
index b489dd5b2..792ca7cae 100644
--- a/samples/charts/data-chart/legends/src/app/app.module.ts
+++ b/samples/charts/data-chart/legends/src/app/app.module.ts
@@ -26,7 +26,6 @@ import { SharedData } from "./SharedData";
     IgxNumberAbbreviatorModule
 ],
   providers: [SharedData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/polar-area-chart-styling/package.json b/samples/charts/data-chart/polar-area-chart-styling/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/polar-area-chart-styling/package.json
+++ b/samples/charts/data-chart/polar-area-chart-styling/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/polar-area-chart/package.json b/samples/charts/data-chart/polar-area-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/polar-area-chart/package.json
+++ b/samples/charts/data-chart/polar-area-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/polar-chart-types/package.json b/samples/charts/data-chart/polar-chart-types/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/polar-chart-types/package.json
+++ b/samples/charts/data-chart/polar-chart-types/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/polar-chart-types/src/app/app.module.ts b/samples/charts/data-chart/polar-chart-types/src/app/app.module.ts
index b6f7d239f..8434f8dac 100644
--- a/samples/charts/data-chart/polar-chart-types/src/app/app.module.ts
+++ b/samples/charts/data-chart/polar-chart-types/src/app/app.module.ts
@@ -27,7 +27,6 @@ import { SamplePolarData } from "./SamplePolarData";
     IgxDataChartInteractivityModule
 ],
   providers: [SamplePolarData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/polar-line-chart/package.json b/samples/charts/data-chart/polar-line-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/polar-line-chart/package.json
+++ b/samples/charts/data-chart/polar-line-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/polar-scatter-chart/package.json b/samples/charts/data-chart/polar-scatter-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/polar-scatter-chart/package.json
+++ b/samples/charts/data-chart/polar-scatter-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/polar-spline-area-chart/package.json b/samples/charts/data-chart/polar-spline-area-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/polar-spline-area-chart/package.json
+++ b/samples/charts/data-chart/polar-spline-area-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/polar-spline-chart/package.json b/samples/charts/data-chart/polar-spline-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/polar-spline-chart/package.json
+++ b/samples/charts/data-chart/polar-spline-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/radial-area-chart-styling/package.json b/samples/charts/data-chart/radial-area-chart-styling/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/radial-area-chart-styling/package.json
+++ b/samples/charts/data-chart/radial-area-chart-styling/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/radial-area-chart/package.json b/samples/charts/data-chart/radial-area-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/radial-area-chart/package.json
+++ b/samples/charts/data-chart/radial-area-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/radial-chart-types/package.json b/samples/charts/data-chart/radial-chart-types/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/radial-chart-types/package.json
+++ b/samples/charts/data-chart/radial-chart-types/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/radial-chart-types/src/app/app.module.ts b/samples/charts/data-chart/radial-chart-types/src/app/app.module.ts
index e1bb5b729..486020171 100644
--- a/samples/charts/data-chart/radial-chart-types/src/app/app.module.ts
+++ b/samples/charts/data-chart/radial-chart-types/src/app/app.module.ts
@@ -27,7 +27,6 @@ import { SampleRadialData } from "./SampleRadialData";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleRadialData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/radial-column-chart/package.json b/samples/charts/data-chart/radial-column-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/radial-column-chart/package.json
+++ b/samples/charts/data-chart/radial-column-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/radial-line-chart/package.json b/samples/charts/data-chart/radial-line-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/radial-line-chart/package.json
+++ b/samples/charts/data-chart/radial-line-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/radial-pie-chart/package.json b/samples/charts/data-chart/radial-pie-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/radial-pie-chart/package.json
+++ b/samples/charts/data-chart/radial-pie-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/range-area-chart/package.json b/samples/charts/data-chart/range-area-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/range-area-chart/package.json
+++ b/samples/charts/data-chart/range-area-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/range-column-chart/package.json b/samples/charts/data-chart/range-column-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/range-column-chart/package.json
+++ b/samples/charts/data-chart/range-column-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/scatter-bubble-chart-multiple-sources/package.json b/samples/charts/data-chart/scatter-bubble-chart-multiple-sources/package.json
index e3be3d568..fb81a9f87 100644
--- a/samples/charts/data-chart/scatter-bubble-chart-multiple-sources/package.json
+++ b/samples/charts/data-chart/scatter-bubble-chart-multiple-sources/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/scatter-bubble-chart-multiple-sources/src/app.module.ts b/samples/charts/data-chart/scatter-bubble-chart-multiple-sources/src/app.module.ts
index 1b5f95f26..6717c1807 100644
--- a/samples/charts/data-chart/scatter-bubble-chart-multiple-sources/src/app.module.ts
+++ b/samples/charts/data-chart/scatter-bubble-chart-multiple-sources/src/app.module.ts
@@ -26,7 +26,6 @@ import { IgxLegendModule, IgxNumberAbbreviatorModule, IgxDataChartCoreModule, Ig
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/scatter-bubble-chart-single-source/package.json b/samples/charts/data-chart/scatter-bubble-chart-single-source/package.json
index e3be3d568..fb81a9f87 100644
--- a/samples/charts/data-chart/scatter-bubble-chart-single-source/package.json
+++ b/samples/charts/data-chart/scatter-bubble-chart-single-source/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/scatter-bubble-chart-single-source/src/app.module.ts b/samples/charts/data-chart/scatter-bubble-chart-single-source/src/app.module.ts
index e14196d13..f42d89914 100644
--- a/samples/charts/data-chart/scatter-bubble-chart-single-source/src/app.module.ts
+++ b/samples/charts/data-chart/scatter-bubble-chart-single-source/src/app.module.ts
@@ -25,7 +25,6 @@ import { IgxNumberAbbreviatorModule, IgxDataChartCoreModule, IgxDataChartScatter
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/scatter-bubble-chart-styling/package.json b/samples/charts/data-chart/scatter-bubble-chart-styling/package.json
index e3be3d568..fb81a9f87 100644
--- a/samples/charts/data-chart/scatter-bubble-chart-styling/package.json
+++ b/samples/charts/data-chart/scatter-bubble-chart-styling/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/scatter-bubble-chart-styling/src/app.module.ts b/samples/charts/data-chart/scatter-bubble-chart-styling/src/app.module.ts
index 1b5f95f26..6717c1807 100644
--- a/samples/charts/data-chart/scatter-bubble-chart-styling/src/app.module.ts
+++ b/samples/charts/data-chart/scatter-bubble-chart-styling/src/app.module.ts
@@ -26,7 +26,6 @@ import { IgxLegendModule, IgxNumberAbbreviatorModule, IgxDataChartCoreModule, Ig
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/scatter-line-chart/package.json b/samples/charts/data-chart/scatter-line-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/scatter-line-chart/package.json
+++ b/samples/charts/data-chart/scatter-line-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/scatter-point-chart/package.json b/samples/charts/data-chart/scatter-point-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/scatter-point-chart/package.json
+++ b/samples/charts/data-chart/scatter-point-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/scatter-spline-chart/package.json b/samples/charts/data-chart/scatter-spline-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/scatter-spline-chart/package.json
+++ b/samples/charts/data-chart/scatter-spline-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/series-animations/package.json b/samples/charts/data-chart/series-animations/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/series-animations/package.json
+++ b/samples/charts/data-chart/series-animations/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/series-animations/src/app/app.module.ts b/samples/charts/data-chart/series-animations/src/app/app.module.ts
index 9e51e0feb..7ba2869a7 100644
--- a/samples/charts/data-chart/series-animations/src/app/app.module.ts
+++ b/samples/charts/data-chart/series-animations/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { SharedData } from "./SharedData";
     IgxDataChartCategoryModule
 ],
   providers: [SharedData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/series-annotations/package.json b/samples/charts/data-chart/series-annotations/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/series-annotations/package.json
+++ b/samples/charts/data-chart/series-annotations/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/series-annotations/src/app/app.module.ts b/samples/charts/data-chart/series-annotations/src/app/app.module.ts
index e49444e1f..9712a71d4 100644
--- a/samples/charts/data-chart/series-annotations/src/app/app.module.ts
+++ b/samples/charts/data-chart/series-annotations/src/app/app.module.ts
@@ -30,7 +30,6 @@ import { SharedData } from "./SharedData";
     IgxDataChartInteractivityModule
 ],
   providers: [SharedData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/series-highlighting/package.json b/samples/charts/data-chart/series-highlighting/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/series-highlighting/package.json
+++ b/samples/charts/data-chart/series-highlighting/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/series-highlighting/src/app/app.module.ts b/samples/charts/data-chart/series-highlighting/src/app/app.module.ts
index 88d4e0027..c17d5f89a 100644
--- a/samples/charts/data-chart/series-highlighting/src/app/app.module.ts
+++ b/samples/charts/data-chart/series-highlighting/src/app/app.module.ts
@@ -26,7 +26,6 @@ import { SharedData } from "./SharedData";
     IgxLegendModule
 ],
   providers: [SharedData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/series-marker-template/package.json b/samples/charts/data-chart/series-marker-template/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/series-marker-template/package.json
+++ b/samples/charts/data-chart/series-marker-template/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/series-marker-template/src/app/app.module.ts b/samples/charts/data-chart/series-marker-template/src/app/app.module.ts
index a55521477..13856e294 100644
--- a/samples/charts/data-chart/series-marker-template/src/app/app.module.ts
+++ b/samples/charts/data-chart/series-marker-template/src/app/app.module.ts
@@ -25,7 +25,6 @@ import { IgxDataChartCoreModule, IgxDataChartCategoryModule, IgxLegendModule, Ig
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/series-markers/package.json b/samples/charts/data-chart/series-markers/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/series-markers/package.json
+++ b/samples/charts/data-chart/series-markers/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/series-markers/src/app/app.module.ts b/samples/charts/data-chart/series-markers/src/app/app.module.ts
index dd2818ab9..f5d8ec4f5 100644
--- a/samples/charts/data-chart/series-markers/src/app/app.module.ts
+++ b/samples/charts/data-chart/series-markers/src/app/app.module.ts
@@ -28,7 +28,6 @@ import { SharedData } from "./SharedData";
     IgxNumberAbbreviatorModule
 ],
   providers: [SharedData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/series-tooltips/package.json b/samples/charts/data-chart/series-tooltips/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/series-tooltips/package.json
+++ b/samples/charts/data-chart/series-tooltips/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/series-tooltips/src/app/app.module.ts b/samples/charts/data-chart/series-tooltips/src/app/app.module.ts
index fc05bf570..d7d879db4 100644
--- a/samples/charts/data-chart/series-tooltips/src/app/app.module.ts
+++ b/samples/charts/data-chart/series-tooltips/src/app/app.module.ts
@@ -26,7 +26,6 @@ import { SharedData } from "./SharedData";
     IgxDataChartInteractivityModule
 ],
   providers: [SharedData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/series-trendlines/package.json b/samples/charts/data-chart/series-trendlines/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/series-trendlines/package.json
+++ b/samples/charts/data-chart/series-trendlines/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/series-trendlines/src/app/app.module.ts b/samples/charts/data-chart/series-trendlines/src/app/app.module.ts
index cd5a76545..0873df9f4 100644
--- a/samples/charts/data-chart/series-trendlines/src/app/app.module.ts
+++ b/samples/charts/data-chart/series-trendlines/src/app/app.module.ts
@@ -28,7 +28,6 @@ import { SampleFinancialData } from "./SampleFinancialData";
     IgxFinancialPriceSeriesModule
 ],
   providers: [SampleFinancialData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/series-value-overlay/package.json b/samples/charts/data-chart/series-value-overlay/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/series-value-overlay/package.json
+++ b/samples/charts/data-chart/series-value-overlay/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/series-value-overlay/src/app/app.module.ts b/samples/charts/data-chart/series-value-overlay/src/app/app.module.ts
index 424c54436..0ecb6d097 100644
--- a/samples/charts/data-chart/series-value-overlay/src/app/app.module.ts
+++ b/samples/charts/data-chart/series-value-overlay/src/app/app.module.ts
@@ -26,7 +26,6 @@ import { SharedData } from "./SharedData";
     IgxLegendModule
 ],
   providers: [SharedData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/stacked-100-area-chart/package.json b/samples/charts/data-chart/stacked-100-area-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/stacked-100-area-chart/package.json
+++ b/samples/charts/data-chart/stacked-100-area-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/stacked-100-bar-chart/package.json b/samples/charts/data-chart/stacked-100-bar-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/stacked-100-bar-chart/package.json
+++ b/samples/charts/data-chart/stacked-100-bar-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/stacked-100-column-chart/package.json b/samples/charts/data-chart/stacked-100-column-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/stacked-100-column-chart/package.json
+++ b/samples/charts/data-chart/stacked-100-column-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/stacked-100-line-chart/package.json b/samples/charts/data-chart/stacked-100-line-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/stacked-100-line-chart/package.json
+++ b/samples/charts/data-chart/stacked-100-line-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/stacked-100-spline-area-chart/package.json b/samples/charts/data-chart/stacked-100-spline-area-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/stacked-100-spline-area-chart/package.json
+++ b/samples/charts/data-chart/stacked-100-spline-area-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/stacked-100-spline-chart/package.json b/samples/charts/data-chart/stacked-100-spline-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/stacked-100-spline-chart/package.json
+++ b/samples/charts/data-chart/stacked-100-spline-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/stacked-area-chart/package.json b/samples/charts/data-chart/stacked-area-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/stacked-area-chart/package.json
+++ b/samples/charts/data-chart/stacked-area-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/stacked-bar-chart/package.json b/samples/charts/data-chart/stacked-bar-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/stacked-bar-chart/package.json
+++ b/samples/charts/data-chart/stacked-bar-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/stacked-chart-types/package.json b/samples/charts/data-chart/stacked-chart-types/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/stacked-chart-types/package.json
+++ b/samples/charts/data-chart/stacked-chart-types/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/stacked-chart-types/src/app/app.module.ts b/samples/charts/data-chart/stacked-chart-types/src/app/app.module.ts
index bee9b1e7d..25c20c4bf 100644
--- a/samples/charts/data-chart/stacked-chart-types/src/app/app.module.ts
+++ b/samples/charts/data-chart/stacked-chart-types/src/app/app.module.ts
@@ -28,7 +28,6 @@ import { SharedData } from "./SharedData";
     IgxStackedFragmentSeriesModule
 ],
   providers: [SharedData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/stacked-column-chart/package.json b/samples/charts/data-chart/stacked-column-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/stacked-column-chart/package.json
+++ b/samples/charts/data-chart/stacked-column-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/stacked-line-chart/package.json b/samples/charts/data-chart/stacked-line-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/stacked-line-chart/package.json
+++ b/samples/charts/data-chart/stacked-line-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/stacked-spline-area-chart/package.json b/samples/charts/data-chart/stacked-spline-area-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/stacked-spline-area-chart/package.json
+++ b/samples/charts/data-chart/stacked-spline-area-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/stacked-spline-chart/package.json b/samples/charts/data-chart/stacked-spline-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/stacked-spline-chart/package.json
+++ b/samples/charts/data-chart/stacked-spline-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/tooltip-template/package.json b/samples/charts/data-chart/tooltip-template/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/tooltip-template/package.json
+++ b/samples/charts/data-chart/tooltip-template/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/tooltip-template/src/app/app.module.ts b/samples/charts/data-chart/tooltip-template/src/app/app.module.ts
index a55521477..13856e294 100644
--- a/samples/charts/data-chart/tooltip-template/src/app/app.module.ts
+++ b/samples/charts/data-chart/tooltip-template/src/app/app.module.ts
@@ -25,7 +25,6 @@ import { IgxDataChartCoreModule, IgxDataChartCategoryModule, IgxLegendModule, Ig
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/transition-event/package.json b/samples/charts/data-chart/transition-event/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/data-chart/transition-event/package.json
+++ b/samples/charts/data-chart/transition-event/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/data-chart/type-category-area-series/package.json b/samples/charts/data-chart/type-category-area-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-category-area-series/package.json
+++ b/samples/charts/data-chart/type-category-area-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-category-area-series/src/app/app.module.ts b/samples/charts/data-chart/type-category-area-series/src/app/app.module.ts
index b800e6b6a..677065ed2 100644
--- a/samples/charts/data-chart/type-category-area-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-category-area-series/src/app/app.module.ts
@@ -26,7 +26,6 @@ import { SampleCategoryData } from "./SampleCategoryData";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleCategoryData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-category-bar-series/package.json b/samples/charts/data-chart/type-category-bar-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-category-bar-series/package.json
+++ b/samples/charts/data-chart/type-category-bar-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-category-bar-series/src/app/app.module.ts b/samples/charts/data-chart/type-category-bar-series/src/app/app.module.ts
index b800e6b6a..677065ed2 100644
--- a/samples/charts/data-chart/type-category-bar-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-category-bar-series/src/app/app.module.ts
@@ -26,7 +26,6 @@ import { SampleCategoryData } from "./SampleCategoryData";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleCategoryData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-category-column-series/package.json b/samples/charts/data-chart/type-category-column-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-category-column-series/package.json
+++ b/samples/charts/data-chart/type-category-column-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-category-column-series/src/app/app.module.ts b/samples/charts/data-chart/type-category-column-series/src/app/app.module.ts
index b800e6b6a..677065ed2 100644
--- a/samples/charts/data-chart/type-category-column-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-category-column-series/src/app/app.module.ts
@@ -26,7 +26,6 @@ import { SampleCategoryData } from "./SampleCategoryData";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleCategoryData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-category-line-series/package.json b/samples/charts/data-chart/type-category-line-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-category-line-series/package.json
+++ b/samples/charts/data-chart/type-category-line-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-category-line-series/src/app/app.module.ts b/samples/charts/data-chart/type-category-line-series/src/app/app.module.ts
index b800e6b6a..677065ed2 100644
--- a/samples/charts/data-chart/type-category-line-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-category-line-series/src/app/app.module.ts
@@ -26,7 +26,6 @@ import { SampleCategoryData } from "./SampleCategoryData";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleCategoryData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-category-point-series/package.json b/samples/charts/data-chart/type-category-point-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-category-point-series/package.json
+++ b/samples/charts/data-chart/type-category-point-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-category-point-series/src/app/app.module.ts b/samples/charts/data-chart/type-category-point-series/src/app/app.module.ts
index b800e6b6a..677065ed2 100644
--- a/samples/charts/data-chart/type-category-point-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-category-point-series/src/app/app.module.ts
@@ -26,7 +26,6 @@ import { SampleCategoryData } from "./SampleCategoryData";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleCategoryData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-category-series/package.json b/samples/charts/data-chart/type-category-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-category-series/package.json
+++ b/samples/charts/data-chart/type-category-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-category-series/src/app/app.module.ts b/samples/charts/data-chart/type-category-series/src/app/app.module.ts
index b800e6b6a..677065ed2 100644
--- a/samples/charts/data-chart/type-category-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-category-series/src/app/app.module.ts
@@ -26,7 +26,6 @@ import { SampleCategoryData } from "./SampleCategoryData";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleCategoryData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-category-spline-area-series/package.json b/samples/charts/data-chart/type-category-spline-area-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-category-spline-area-series/package.json
+++ b/samples/charts/data-chart/type-category-spline-area-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-category-spline-area-series/src/app/app.module.ts b/samples/charts/data-chart/type-category-spline-area-series/src/app/app.module.ts
index b800e6b6a..677065ed2 100644
--- a/samples/charts/data-chart/type-category-spline-area-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-category-spline-area-series/src/app/app.module.ts
@@ -26,7 +26,6 @@ import { SampleCategoryData } from "./SampleCategoryData";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleCategoryData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-category-spline-series/package.json b/samples/charts/data-chart/type-category-spline-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-category-spline-series/package.json
+++ b/samples/charts/data-chart/type-category-spline-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-category-spline-series/src/app/app.module.ts b/samples/charts/data-chart/type-category-spline-series/src/app/app.module.ts
index b800e6b6a..677065ed2 100644
--- a/samples/charts/data-chart/type-category-spline-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-category-spline-series/src/app/app.module.ts
@@ -26,7 +26,6 @@ import { SampleCategoryData } from "./SampleCategoryData";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleCategoryData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-category-step-area-series/package.json b/samples/charts/data-chart/type-category-step-area-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-category-step-area-series/package.json
+++ b/samples/charts/data-chart/type-category-step-area-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-category-step-area-series/src/app/app.module.ts b/samples/charts/data-chart/type-category-step-area-series/src/app/app.module.ts
index b800e6b6a..677065ed2 100644
--- a/samples/charts/data-chart/type-category-step-area-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-category-step-area-series/src/app/app.module.ts
@@ -26,7 +26,6 @@ import { SampleCategoryData } from "./SampleCategoryData";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleCategoryData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-category-step-line-series/package.json b/samples/charts/data-chart/type-category-step-line-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-category-step-line-series/package.json
+++ b/samples/charts/data-chart/type-category-step-line-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-category-step-line-series/src/app/app.module.ts b/samples/charts/data-chart/type-category-step-line-series/src/app/app.module.ts
index b800e6b6a..677065ed2 100644
--- a/samples/charts/data-chart/type-category-step-line-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-category-step-line-series/src/app/app.module.ts
@@ -26,7 +26,6 @@ import { SampleCategoryData } from "./SampleCategoryData";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleCategoryData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-category-waterfall-series/package.json b/samples/charts/data-chart/type-category-waterfall-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-category-waterfall-series/package.json
+++ b/samples/charts/data-chart/type-category-waterfall-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-category-waterfall-series/src/app/app.module.ts b/samples/charts/data-chart/type-category-waterfall-series/src/app/app.module.ts
index b800e6b6a..677065ed2 100644
--- a/samples/charts/data-chart/type-category-waterfall-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-category-waterfall-series/src/app/app.module.ts
@@ -26,7 +26,6 @@ import { SampleCategoryData } from "./SampleCategoryData";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleCategoryData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-financial-area-indicators/package.json b/samples/charts/data-chart/type-financial-area-indicators/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-financial-area-indicators/package.json
+++ b/samples/charts/data-chart/type-financial-area-indicators/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-financial-area-indicators/src/app/app.module.ts b/samples/charts/data-chart/type-financial-area-indicators/src/app/app.module.ts
index 6930ae32b..2b3dd1fd5 100644
--- a/samples/charts/data-chart/type-financial-area-indicators/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-financial-area-indicators/src/app/app.module.ts
@@ -29,7 +29,6 @@ import { SampleFinancialData } from "./SampleFinancialData";
     IgxFinancialPriceSeriesModule
 ],
   providers: [SampleFinancialData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-financial-candlestick-series/package.json b/samples/charts/data-chart/type-financial-candlestick-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-financial-candlestick-series/package.json
+++ b/samples/charts/data-chart/type-financial-candlestick-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-financial-candlestick-series/src/app/app.module.ts b/samples/charts/data-chart/type-financial-candlestick-series/src/app/app.module.ts
index c0c0cf71f..887e48bbe 100644
--- a/samples/charts/data-chart/type-financial-candlestick-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-financial-candlestick-series/src/app/app.module.ts
@@ -31,7 +31,6 @@ import { SampleFinancialData } from "./SampleFinancialData";
     IgxCategoryXAxisModule
 ],
   providers: [SampleFinancialData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-financial-column-indicators/package.json b/samples/charts/data-chart/type-financial-column-indicators/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-financial-column-indicators/package.json
+++ b/samples/charts/data-chart/type-financial-column-indicators/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-financial-column-indicators/src/app/app.module.ts b/samples/charts/data-chart/type-financial-column-indicators/src/app/app.module.ts
index 6930ae32b..2b3dd1fd5 100644
--- a/samples/charts/data-chart/type-financial-column-indicators/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-financial-column-indicators/src/app/app.module.ts
@@ -29,7 +29,6 @@ import { SampleFinancialData } from "./SampleFinancialData";
     IgxFinancialPriceSeriesModule
 ],
   providers: [SampleFinancialData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-financial-line-indicators/package.json b/samples/charts/data-chart/type-financial-line-indicators/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-financial-line-indicators/package.json
+++ b/samples/charts/data-chart/type-financial-line-indicators/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-financial-line-indicators/src/app/app.module.ts b/samples/charts/data-chart/type-financial-line-indicators/src/app/app.module.ts
index 6930ae32b..2b3dd1fd5 100644
--- a/samples/charts/data-chart/type-financial-line-indicators/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-financial-line-indicators/src/app/app.module.ts
@@ -29,7 +29,6 @@ import { SampleFinancialData } from "./SampleFinancialData";
     IgxFinancialPriceSeriesModule
 ],
   providers: [SampleFinancialData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-financial-ohlc-series/package.json b/samples/charts/data-chart/type-financial-ohlc-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-financial-ohlc-series/package.json
+++ b/samples/charts/data-chart/type-financial-ohlc-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-financial-ohlc-series/src/app/app.module.ts b/samples/charts/data-chart/type-financial-ohlc-series/src/app/app.module.ts
index c0c0cf71f..887e48bbe 100644
--- a/samples/charts/data-chart/type-financial-ohlc-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-financial-ohlc-series/src/app/app.module.ts
@@ -31,7 +31,6 @@ import { SampleFinancialData } from "./SampleFinancialData";
     IgxCategoryXAxisModule
 ],
   providers: [SampleFinancialData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-financial-overlays/package.json b/samples/charts/data-chart/type-financial-overlays/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-financial-overlays/package.json
+++ b/samples/charts/data-chart/type-financial-overlays/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-financial-overlays/src/app/app.module.ts b/samples/charts/data-chart/type-financial-overlays/src/app/app.module.ts
index 6930ae32b..2b3dd1fd5 100644
--- a/samples/charts/data-chart/type-financial-overlays/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-financial-overlays/src/app/app.module.ts
@@ -29,7 +29,6 @@ import { SampleFinancialData } from "./SampleFinancialData";
     IgxFinancialPriceSeriesModule
 ],
   providers: [SampleFinancialData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-financial-series/package.json b/samples/charts/data-chart/type-financial-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-financial-series/package.json
+++ b/samples/charts/data-chart/type-financial-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-financial-series/src/app/app.module.ts b/samples/charts/data-chart/type-financial-series/src/app/app.module.ts
index c0c0cf71f..887e48bbe 100644
--- a/samples/charts/data-chart/type-financial-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-financial-series/src/app/app.module.ts
@@ -31,7 +31,6 @@ import { SampleFinancialData } from "./SampleFinancialData";
     IgxCategoryXAxisModule
 ],
   providers: [SampleFinancialData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-radial-area-series/package.json b/samples/charts/data-chart/type-radial-area-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-radial-area-series/package.json
+++ b/samples/charts/data-chart/type-radial-area-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-radial-area-series/src/app/app.module.ts b/samples/charts/data-chart/type-radial-area-series/src/app/app.module.ts
index e1bb5b729..486020171 100644
--- a/samples/charts/data-chart/type-radial-area-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-radial-area-series/src/app/app.module.ts
@@ -27,7 +27,6 @@ import { SampleRadialData } from "./SampleRadialData";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleRadialData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-radial-column-series/package.json b/samples/charts/data-chart/type-radial-column-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-radial-column-series/package.json
+++ b/samples/charts/data-chart/type-radial-column-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-radial-column-series/src/app/app.module.ts b/samples/charts/data-chart/type-radial-column-series/src/app/app.module.ts
index e1bb5b729..486020171 100644
--- a/samples/charts/data-chart/type-radial-column-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-radial-column-series/src/app/app.module.ts
@@ -27,7 +27,6 @@ import { SampleRadialData } from "./SampleRadialData";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleRadialData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-radial-line-series/package.json b/samples/charts/data-chart/type-radial-line-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-radial-line-series/package.json
+++ b/samples/charts/data-chart/type-radial-line-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-radial-line-series/src/app/app.module.ts b/samples/charts/data-chart/type-radial-line-series/src/app/app.module.ts
index e1bb5b729..486020171 100644
--- a/samples/charts/data-chart/type-radial-line-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-radial-line-series/src/app/app.module.ts
@@ -27,7 +27,6 @@ import { SampleRadialData } from "./SampleRadialData";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleRadialData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-radial-pie-series/package.json b/samples/charts/data-chart/type-radial-pie-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-radial-pie-series/package.json
+++ b/samples/charts/data-chart/type-radial-pie-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-radial-pie-series/src/app/app.module.ts b/samples/charts/data-chart/type-radial-pie-series/src/app/app.module.ts
index e1bb5b729..486020171 100644
--- a/samples/charts/data-chart/type-radial-pie-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-radial-pie-series/src/app/app.module.ts
@@ -27,7 +27,6 @@ import { SampleRadialData } from "./SampleRadialData";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleRadialData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-range-area-series/package.json b/samples/charts/data-chart/type-range-area-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-range-area-series/package.json
+++ b/samples/charts/data-chart/type-range-area-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-range-area-series/src/app/app.module.ts b/samples/charts/data-chart/type-range-area-series/src/app/app.module.ts
index a4088b62b..e5b42dceb 100644
--- a/samples/charts/data-chart/type-range-area-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-range-area-series/src/app/app.module.ts
@@ -26,7 +26,6 @@ import { SampleRangeData } from "./SampleRangeData";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleRangeData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-range-column-series/package.json b/samples/charts/data-chart/type-range-column-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-range-column-series/package.json
+++ b/samples/charts/data-chart/type-range-column-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-range-column-series/src/app/app.module.ts b/samples/charts/data-chart/type-range-column-series/src/app/app.module.ts
index a4088b62b..e5b42dceb 100644
--- a/samples/charts/data-chart/type-range-column-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-range-column-series/src/app/app.module.ts
@@ -26,7 +26,6 @@ import { SampleRangeData } from "./SampleRangeData";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleRangeData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-range-series/package.json b/samples/charts/data-chart/type-range-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-range-series/package.json
+++ b/samples/charts/data-chart/type-range-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-range-series/src/app/app.module.ts b/samples/charts/data-chart/type-range-series/src/app/app.module.ts
index a4088b62b..e5b42dceb 100644
--- a/samples/charts/data-chart/type-range-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-range-series/src/app/app.module.ts
@@ -26,7 +26,6 @@ import { SampleRangeData } from "./SampleRangeData";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleRangeData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-scatter-area-series/package.json b/samples/charts/data-chart/type-scatter-area-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-scatter-area-series/package.json
+++ b/samples/charts/data-chart/type-scatter-area-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-scatter-area-series/src/app/app.module.ts b/samples/charts/data-chart/type-scatter-area-series/src/app/app.module.ts
index 39f117ac2..504428560 100644
--- a/samples/charts/data-chart/type-scatter-area-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-scatter-area-series/src/app/app.module.ts
@@ -28,7 +28,6 @@ import { SampleScatterData } from "./SampleScatterData";
     IgxScatterAreaSeriesModule
 ],
   providers: [SampleScatterData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-scatter-bubble-series/package.json b/samples/charts/data-chart/type-scatter-bubble-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-scatter-bubble-series/package.json
+++ b/samples/charts/data-chart/type-scatter-bubble-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-scatter-bubble-series/src/app/app.module.ts b/samples/charts/data-chart/type-scatter-bubble-series/src/app/app.module.ts
index b5f2a4d6d..24f3f413b 100644
--- a/samples/charts/data-chart/type-scatter-bubble-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-scatter-bubble-series/src/app/app.module.ts
@@ -28,7 +28,6 @@ import { SampleScatterStats } from "./SampleScatterStats";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleScatterStats],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-scatter-contour-series/package.json b/samples/charts/data-chart/type-scatter-contour-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-scatter-contour-series/package.json
+++ b/samples/charts/data-chart/type-scatter-contour-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-scatter-contour-series/src/app/app.module.ts b/samples/charts/data-chart/type-scatter-contour-series/src/app/app.module.ts
index d436415b5..e9f25bc61 100644
--- a/samples/charts/data-chart/type-scatter-contour-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-scatter-contour-series/src/app/app.module.ts
@@ -29,7 +29,6 @@ import { SampleScatterData } from "./SampleScatterData";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleScatterData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-scatter-hd-series/package.json b/samples/charts/data-chart/type-scatter-hd-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-scatter-hd-series/package.json
+++ b/samples/charts/data-chart/type-scatter-hd-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-scatter-hd-series/src/app/app.module.ts b/samples/charts/data-chart/type-scatter-hd-series/src/app/app.module.ts
index bd04b0ffc..d45b6e60d 100644
--- a/samples/charts/data-chart/type-scatter-hd-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-scatter-hd-series/src/app/app.module.ts
@@ -27,7 +27,6 @@ import { SampleDensityData } from "./SampleDensityData";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleDensityData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-scatter-line-series/package.json b/samples/charts/data-chart/type-scatter-line-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-scatter-line-series/package.json
+++ b/samples/charts/data-chart/type-scatter-line-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-scatter-line-series/src/app/app.module.ts b/samples/charts/data-chart/type-scatter-line-series/src/app/app.module.ts
index ed4aa9f9f..48441180c 100644
--- a/samples/charts/data-chart/type-scatter-line-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-scatter-line-series/src/app/app.module.ts
@@ -27,7 +27,6 @@ import { SampleScatterData } from "./SampleScatterStats";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleScatterData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-scatter-point-series/package.json b/samples/charts/data-chart/type-scatter-point-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-scatter-point-series/package.json
+++ b/samples/charts/data-chart/type-scatter-point-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-scatter-point-series/src/app/app.module.ts b/samples/charts/data-chart/type-scatter-point-series/src/app/app.module.ts
index ed4aa9f9f..48441180c 100644
--- a/samples/charts/data-chart/type-scatter-point-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-scatter-point-series/src/app/app.module.ts
@@ -27,7 +27,6 @@ import { SampleScatterData } from "./SampleScatterStats";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleScatterData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-scatter-polygon-series/package.json b/samples/charts/data-chart/type-scatter-polygon-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-scatter-polygon-series/package.json
+++ b/samples/charts/data-chart/type-scatter-polygon-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-scatter-polygon-series/src/app/app.module.ts b/samples/charts/data-chart/type-scatter-polygon-series/src/app/app.module.ts
index 4cacbc684..4cc2c2c8c 100644
--- a/samples/charts/data-chart/type-scatter-polygon-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-scatter-polygon-series/src/app/app.module.ts
@@ -27,7 +27,6 @@ import { IgxDataChartCoreModule, IgxDataChartShapeModule, IgxDataChartShapeCoreM
     IgxDataChartScatterModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-scatter-polyline-series/package.json b/samples/charts/data-chart/type-scatter-polyline-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-scatter-polyline-series/package.json
+++ b/samples/charts/data-chart/type-scatter-polyline-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-scatter-polyline-series/src/app/app.module.ts b/samples/charts/data-chart/type-scatter-polyline-series/src/app/app.module.ts
index 4cacbc684..4cc2c2c8c 100644
--- a/samples/charts/data-chart/type-scatter-polyline-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-scatter-polyline-series/src/app/app.module.ts
@@ -27,7 +27,6 @@ import { IgxDataChartCoreModule, IgxDataChartShapeModule, IgxDataChartShapeCoreM
     IgxDataChartScatterModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-scatter-series/package.json b/samples/charts/data-chart/type-scatter-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-scatter-series/package.json
+++ b/samples/charts/data-chart/type-scatter-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-scatter-series/src/app/app.module.ts b/samples/charts/data-chart/type-scatter-series/src/app/app.module.ts
index 0d850c7c1..f0394aaed 100644
--- a/samples/charts/data-chart/type-scatter-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-scatter-series/src/app/app.module.ts
@@ -27,7 +27,6 @@ import { SampleScatterStats } from "./SampleScatterStats";
     IgxLegendModule
 ],
   providers: [SampleScatterStats],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-scatter-spline-series/package.json b/samples/charts/data-chart/type-scatter-spline-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-scatter-spline-series/package.json
+++ b/samples/charts/data-chart/type-scatter-spline-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-scatter-spline-series/src/app/app.module.ts b/samples/charts/data-chart/type-scatter-spline-series/src/app/app.module.ts
index ed4aa9f9f..48441180c 100644
--- a/samples/charts/data-chart/type-scatter-spline-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-scatter-spline-series/src/app/app.module.ts
@@ -27,7 +27,6 @@ import { SampleScatterData } from "./SampleScatterStats";
     IgxDataChartInteractivityModule
 ],
   providers: [SampleScatterData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-shape-series/package.json b/samples/charts/data-chart/type-shape-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-shape-series/package.json
+++ b/samples/charts/data-chart/type-shape-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-shape-series/src/app/app.module.ts b/samples/charts/data-chart/type-shape-series/src/app/app.module.ts
index ab4de4e32..9a78c3239 100644
--- a/samples/charts/data-chart/type-shape-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-shape-series/src/app/app.module.ts
@@ -27,7 +27,6 @@ import { SampleShapeData } from "./SampleShapeData";
     IgxDataChartScatterModule
 ],
   providers: [SampleShapeData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-stacked-100-area-series/package.json b/samples/charts/data-chart/type-stacked-100-area-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-stacked-100-area-series/package.json
+++ b/samples/charts/data-chart/type-stacked-100-area-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-stacked-100-area-series/src/app/app.module.ts b/samples/charts/data-chart/type-stacked-100-area-series/src/app/app.module.ts
index bee9b1e7d..25c20c4bf 100644
--- a/samples/charts/data-chart/type-stacked-100-area-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-stacked-100-area-series/src/app/app.module.ts
@@ -28,7 +28,6 @@ import { SharedData } from "./SharedData";
     IgxStackedFragmentSeriesModule
 ],
   providers: [SharedData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-stacked-100-bar-series/package.json b/samples/charts/data-chart/type-stacked-100-bar-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-stacked-100-bar-series/package.json
+++ b/samples/charts/data-chart/type-stacked-100-bar-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-stacked-100-bar-series/src/app/app.module.ts b/samples/charts/data-chart/type-stacked-100-bar-series/src/app/app.module.ts
index bee9b1e7d..25c20c4bf 100644
--- a/samples/charts/data-chart/type-stacked-100-bar-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-stacked-100-bar-series/src/app/app.module.ts
@@ -28,7 +28,6 @@ import { SharedData } from "./SharedData";
     IgxStackedFragmentSeriesModule
 ],
   providers: [SharedData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-stacked-100-column-series/package.json b/samples/charts/data-chart/type-stacked-100-column-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-stacked-100-column-series/package.json
+++ b/samples/charts/data-chart/type-stacked-100-column-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-stacked-100-column-series/src/app/app.module.ts b/samples/charts/data-chart/type-stacked-100-column-series/src/app/app.module.ts
index bee9b1e7d..25c20c4bf 100644
--- a/samples/charts/data-chart/type-stacked-100-column-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-stacked-100-column-series/src/app/app.module.ts
@@ -28,7 +28,6 @@ import { SharedData } from "./SharedData";
     IgxStackedFragmentSeriesModule
 ],
   providers: [SharedData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-stacked-100-line-series/package.json b/samples/charts/data-chart/type-stacked-100-line-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-stacked-100-line-series/package.json
+++ b/samples/charts/data-chart/type-stacked-100-line-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-stacked-100-line-series/src/app/app.module.ts b/samples/charts/data-chart/type-stacked-100-line-series/src/app/app.module.ts
index bee9b1e7d..25c20c4bf 100644
--- a/samples/charts/data-chart/type-stacked-100-line-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-stacked-100-line-series/src/app/app.module.ts
@@ -28,7 +28,6 @@ import { SharedData } from "./SharedData";
     IgxStackedFragmentSeriesModule
 ],
   providers: [SharedData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-stacked-100-spline-area-series/package.json b/samples/charts/data-chart/type-stacked-100-spline-area-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-stacked-100-spline-area-series/package.json
+++ b/samples/charts/data-chart/type-stacked-100-spline-area-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-stacked-100-spline-area-series/src/app/app.module.ts b/samples/charts/data-chart/type-stacked-100-spline-area-series/src/app/app.module.ts
index bee9b1e7d..25c20c4bf 100644
--- a/samples/charts/data-chart/type-stacked-100-spline-area-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-stacked-100-spline-area-series/src/app/app.module.ts
@@ -28,7 +28,6 @@ import { SharedData } from "./SharedData";
     IgxStackedFragmentSeriesModule
 ],
   providers: [SharedData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-stacked-100-spline-series/package.json b/samples/charts/data-chart/type-stacked-100-spline-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-stacked-100-spline-series/package.json
+++ b/samples/charts/data-chart/type-stacked-100-spline-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-stacked-100-spline-series/src/app/app.module.ts b/samples/charts/data-chart/type-stacked-100-spline-series/src/app/app.module.ts
index bee9b1e7d..25c20c4bf 100644
--- a/samples/charts/data-chart/type-stacked-100-spline-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-stacked-100-spline-series/src/app/app.module.ts
@@ -28,7 +28,6 @@ import { SharedData } from "./SharedData";
     IgxStackedFragmentSeriesModule
 ],
   providers: [SharedData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-stacked-area-series/package.json b/samples/charts/data-chart/type-stacked-area-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-stacked-area-series/package.json
+++ b/samples/charts/data-chart/type-stacked-area-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-stacked-area-series/src/app/app.module.ts b/samples/charts/data-chart/type-stacked-area-series/src/app/app.module.ts
index bee9b1e7d..25c20c4bf 100644
--- a/samples/charts/data-chart/type-stacked-area-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-stacked-area-series/src/app/app.module.ts
@@ -28,7 +28,6 @@ import { SharedData } from "./SharedData";
     IgxStackedFragmentSeriesModule
 ],
   providers: [SharedData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-stacked-bar-series/package.json b/samples/charts/data-chart/type-stacked-bar-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-stacked-bar-series/package.json
+++ b/samples/charts/data-chart/type-stacked-bar-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-stacked-bar-series/src/app/app.module.ts b/samples/charts/data-chart/type-stacked-bar-series/src/app/app.module.ts
index bee9b1e7d..25c20c4bf 100644
--- a/samples/charts/data-chart/type-stacked-bar-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-stacked-bar-series/src/app/app.module.ts
@@ -28,7 +28,6 @@ import { SharedData } from "./SharedData";
     IgxStackedFragmentSeriesModule
 ],
   providers: [SharedData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-stacked-column-series/package.json b/samples/charts/data-chart/type-stacked-column-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-stacked-column-series/package.json
+++ b/samples/charts/data-chart/type-stacked-column-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-stacked-column-series/src/app/app.module.ts b/samples/charts/data-chart/type-stacked-column-series/src/app/app.module.ts
index bee9b1e7d..25c20c4bf 100644
--- a/samples/charts/data-chart/type-stacked-column-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-stacked-column-series/src/app/app.module.ts
@@ -28,7 +28,6 @@ import { SharedData } from "./SharedData";
     IgxStackedFragmentSeriesModule
 ],
   providers: [SharedData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-stacked-line-series/package.json b/samples/charts/data-chart/type-stacked-line-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-stacked-line-series/package.json
+++ b/samples/charts/data-chart/type-stacked-line-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-stacked-line-series/src/app/app.module.ts b/samples/charts/data-chart/type-stacked-line-series/src/app/app.module.ts
index bee9b1e7d..25c20c4bf 100644
--- a/samples/charts/data-chart/type-stacked-line-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-stacked-line-series/src/app/app.module.ts
@@ -28,7 +28,6 @@ import { SharedData } from "./SharedData";
     IgxStackedFragmentSeriesModule
 ],
   providers: [SharedData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-stacked-spline-area-series/package.json b/samples/charts/data-chart/type-stacked-spline-area-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-stacked-spline-area-series/package.json
+++ b/samples/charts/data-chart/type-stacked-spline-area-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-stacked-spline-area-series/src/app/app.module.ts b/samples/charts/data-chart/type-stacked-spline-area-series/src/app/app.module.ts
index bee9b1e7d..25c20c4bf 100644
--- a/samples/charts/data-chart/type-stacked-spline-area-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-stacked-spline-area-series/src/app/app.module.ts
@@ -28,7 +28,6 @@ import { SharedData } from "./SharedData";
     IgxStackedFragmentSeriesModule
 ],
   providers: [SharedData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/type-stacked-spline-series/package.json b/samples/charts/data-chart/type-stacked-spline-series/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/data-chart/type-stacked-spline-series/package.json
+++ b/samples/charts/data-chart/type-stacked-spline-series/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/data-chart/type-stacked-spline-series/src/app/app.module.ts b/samples/charts/data-chart/type-stacked-spline-series/src/app/app.module.ts
index bee9b1e7d..25c20c4bf 100644
--- a/samples/charts/data-chart/type-stacked-spline-series/src/app/app.module.ts
+++ b/samples/charts/data-chart/type-stacked-spline-series/src/app/app.module.ts
@@ -28,7 +28,6 @@ import { SharedData } from "./SharedData";
     IgxStackedFragmentSeriesModule
 ],
   providers: [SharedData],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/data-chart/waterfall-chart/package.json b/samples/charts/data-chart/waterfall-chart/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/data-chart/waterfall-chart/package.json
+++ b/samples/charts/data-chart/waterfall-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/doughnut-chart/animation/package.json b/samples/charts/doughnut-chart/animation/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/doughnut-chart/animation/package.json
+++ b/samples/charts/doughnut-chart/animation/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/doughnut-chart/animation/src/app/app.module.ts b/samples/charts/doughnut-chart/animation/src/app/app.module.ts
index 78bc09c03..7dcc9ab41 100644
--- a/samples/charts/doughnut-chart/animation/src/app/app.module.ts
+++ b/samples/charts/doughnut-chart/animation/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDoughnutChartModule, IgxRingSeriesModule, IgxLegendModule } from "ig
     IgxLegendModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/doughnut-chart/explosion/package.json b/samples/charts/doughnut-chart/explosion/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/doughnut-chart/explosion/package.json
+++ b/samples/charts/doughnut-chart/explosion/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/doughnut-chart/explosion/src/app/app.module.ts b/samples/charts/doughnut-chart/explosion/src/app/app.module.ts
index 78bc09c03..7dcc9ab41 100644
--- a/samples/charts/doughnut-chart/explosion/src/app/app.module.ts
+++ b/samples/charts/doughnut-chart/explosion/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDoughnutChartModule, IgxRingSeriesModule, IgxLegendModule } from "ig
     IgxLegendModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/doughnut-chart/legend/package.json b/samples/charts/doughnut-chart/legend/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/doughnut-chart/legend/package.json
+++ b/samples/charts/doughnut-chart/legend/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/doughnut-chart/overview/package.json b/samples/charts/doughnut-chart/overview/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/doughnut-chart/overview/package.json
+++ b/samples/charts/doughnut-chart/overview/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/doughnut-chart/rings/package.json b/samples/charts/doughnut-chart/rings/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/doughnut-chart/rings/package.json
+++ b/samples/charts/doughnut-chart/rings/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/doughnut-chart/selection/package.json b/samples/charts/doughnut-chart/selection/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/doughnut-chart/selection/package.json
+++ b/samples/charts/doughnut-chart/selection/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/doughnut-chart/selection/src/app/app.module.ts b/samples/charts/doughnut-chart/selection/src/app/app.module.ts
index 8ebf16925..cd662d65a 100644
--- a/samples/charts/doughnut-chart/selection/src/app/app.module.ts
+++ b/samples/charts/doughnut-chart/selection/src/app/app.module.ts
@@ -25,7 +25,6 @@ import { IgxDoughnutChartModule, IgxRingSeriesModule, IgxLegendModule, IgxItemLe
     IgxItemLegendModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/financial-chart/annotations/package.json b/samples/charts/financial-chart/annotations/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/financial-chart/annotations/package.json
+++ b/samples/charts/financial-chart/annotations/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/annotations/src/app/app.module.ts b/samples/charts/financial-chart/annotations/src/app/app.module.ts
index 2be1662bc..8695df899 100644
--- a/samples/charts/financial-chart/annotations/src/app/app.module.ts
+++ b/samples/charts/financial-chart/annotations/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { StocksUtility } from "./StocksUtility";
     IgxLegendModule
 ],
   providers: [StocksUtility],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/financial-chart/axis-types/package.json b/samples/charts/financial-chart/axis-types/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/financial-chart/axis-types/package.json
+++ b/samples/charts/financial-chart/axis-types/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/axis-types/src/app/app.module.ts b/samples/charts/financial-chart/axis-types/src/app/app.module.ts
index c8112d6a0..508b99722 100644
--- a/samples/charts/financial-chart/axis-types/src/app/app.module.ts
+++ b/samples/charts/financial-chart/axis-types/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { FinancialDataService } from "./FinancialDataService";
     IgxLegendModule
 ],
   providers: [FinancialDataService],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/financial-chart/data-legend-formatting-currency/package.json b/samples/charts/financial-chart/data-legend-formatting-currency/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/financial-chart/data-legend-formatting-currency/package.json
+++ b/samples/charts/financial-chart/data-legend-formatting-currency/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/data-legend-styling-props/package.json b/samples/charts/financial-chart/data-legend-styling-props/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/financial-chart/data-legend-styling-props/package.json
+++ b/samples/charts/financial-chart/data-legend-styling-props/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/data-legend/package.json b/samples/charts/financial-chart/data-legend/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/financial-chart/data-legend/package.json
+++ b/samples/charts/financial-chart/data-legend/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/data-tooltip-formatting-currency/package.json b/samples/charts/financial-chart/data-tooltip-formatting-currency/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/financial-chart/data-tooltip-formatting-currency/package.json
+++ b/samples/charts/financial-chart/data-tooltip-formatting-currency/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/data-tooltip-styling-props/package.json b/samples/charts/financial-chart/data-tooltip-styling-props/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/financial-chart/data-tooltip-styling-props/package.json
+++ b/samples/charts/financial-chart/data-tooltip-styling-props/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/data-tooltip/package.json b/samples/charts/financial-chart/data-tooltip/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/financial-chart/data-tooltip/package.json
+++ b/samples/charts/financial-chart/data-tooltip/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/high-frequency/package.json b/samples/charts/financial-chart/high-frequency/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/financial-chart/high-frequency/package.json
+++ b/samples/charts/financial-chart/high-frequency/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/high-frequency/src/app/app.module.ts b/samples/charts/financial-chart/high-frequency/src/app/app.module.ts
index cbc8b42c1..9aac88519 100644
--- a/samples/charts/financial-chart/high-frequency/src/app/app.module.ts
+++ b/samples/charts/financial-chart/high-frequency/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxSliderModule } from "igniteui-angular";
     IgxSliderModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/financial-chart/high-volume/package.json b/samples/charts/financial-chart/high-volume/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/financial-chart/high-volume/package.json
+++ b/samples/charts/financial-chart/high-volume/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/high-volume/src/app/app.module.ts b/samples/charts/financial-chart/high-volume/src/app/app.module.ts
index a3cc1e876..7d3186076 100644
--- a/samples/charts/financial-chart/high-volume/src/app/app.module.ts
+++ b/samples/charts/financial-chart/high-volume/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { GenerateHourlyPricesService } from "./GenerateHourlyPricesService";
     IgxLegendModule
 ],
   providers: [GenerateHourlyPricesService],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/financial-chart/indicator-customization/package.json b/samples/charts/financial-chart/indicator-customization/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/financial-chart/indicator-customization/package.json
+++ b/samples/charts/financial-chart/indicator-customization/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/indicator-customization/src/app/app.module.ts b/samples/charts/financial-chart/indicator-customization/src/app/app.module.ts
index c8112d6a0..508b99722 100644
--- a/samples/charts/financial-chart/indicator-customization/src/app/app.module.ts
+++ b/samples/charts/financial-chart/indicator-customization/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { FinancialDataService } from "./FinancialDataService";
     IgxLegendModule
 ],
   providers: [FinancialDataService],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/financial-chart/indicator-types/package.json b/samples/charts/financial-chart/indicator-types/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/financial-chart/indicator-types/package.json
+++ b/samples/charts/financial-chart/indicator-types/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/indicator-types/src/app/app.module.ts b/samples/charts/financial-chart/indicator-types/src/app/app.module.ts
index c8112d6a0..508b99722 100644
--- a/samples/charts/financial-chart/indicator-types/src/app/app.module.ts
+++ b/samples/charts/financial-chart/indicator-types/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { FinancialDataService } from "./FinancialDataService";
     IgxLegendModule
 ],
   providers: [FinancialDataService],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/financial-chart/multiple-data/package.json b/samples/charts/financial-chart/multiple-data/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/financial-chart/multiple-data/package.json
+++ b/samples/charts/financial-chart/multiple-data/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/multiple-data/src/app/app.module.ts b/samples/charts/financial-chart/multiple-data/src/app/app.module.ts
index c8112d6a0..508b99722 100644
--- a/samples/charts/financial-chart/multiple-data/src/app/app.module.ts
+++ b/samples/charts/financial-chart/multiple-data/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { FinancialDataService } from "./FinancialDataService";
     IgxLegendModule
 ],
   providers: [FinancialDataService],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/financial-chart/multiple-feeds/package.json b/samples/charts/financial-chart/multiple-feeds/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/financial-chart/multiple-feeds/package.json
+++ b/samples/charts/financial-chart/multiple-feeds/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/multiple-feeds/src/app/app.module.ts b/samples/charts/financial-chart/multiple-feeds/src/app/app.module.ts
index 098fbc3ed..3f12dbe81 100644
--- a/samples/charts/financial-chart/multiple-feeds/src/app/app.module.ts
+++ b/samples/charts/financial-chart/multiple-feeds/src/app/app.module.ts
@@ -23,7 +23,6 @@ import { IgxFinancialChartModule, IgxLegendModule } from "igniteui-angular-chart
     IgxLegendModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/financial-chart/overview/package.json b/samples/charts/financial-chart/overview/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/financial-chart/overview/package.json
+++ b/samples/charts/financial-chart/overview/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/overview/src/app/app.module.ts b/samples/charts/financial-chart/overview/src/app/app.module.ts
index c8112d6a0..508b99722 100644
--- a/samples/charts/financial-chart/overview/src/app/app.module.ts
+++ b/samples/charts/financial-chart/overview/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { FinancialDataService } from "./FinancialDataService";
     IgxLegendModule
 ],
   providers: [FinancialDataService],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/financial-chart/panes/package.json b/samples/charts/financial-chart/panes/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/financial-chart/panes/package.json
+++ b/samples/charts/financial-chart/panes/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/panes/src/app/app.module.ts b/samples/charts/financial-chart/panes/src/app/app.module.ts
index e527ab442..21aa96185 100644
--- a/samples/charts/financial-chart/panes/src/app/app.module.ts
+++ b/samples/charts/financial-chart/panes/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { StockDataService } from "./StockDataService";
     IgxLegendModule
 ],
   providers: [StockDataService],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/financial-chart/performance/package.json b/samples/charts/financial-chart/performance/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/financial-chart/performance/package.json
+++ b/samples/charts/financial-chart/performance/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/performance/src/app/app.module.ts b/samples/charts/financial-chart/performance/src/app/app.module.ts
index 1b9901b4d..6d2ddb95b 100644
--- a/samples/charts/financial-chart/performance/src/app/app.module.ts
+++ b/samples/charts/financial-chart/performance/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { GenerateOhlcPricesService } from "./GenerateOhlcPricesService";
     IgxLegendModule
 ],
   providers: [GenerateOhlcPricesService],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/financial-chart/scrollbars/package.json b/samples/charts/financial-chart/scrollbars/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/financial-chart/scrollbars/package.json
+++ b/samples/charts/financial-chart/scrollbars/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/stock-index-chart/package.json b/samples/charts/financial-chart/stock-index-chart/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/financial-chart/stock-index-chart/package.json
+++ b/samples/charts/financial-chart/stock-index-chart/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/stock-index-chart/src/app/app.module.ts b/samples/charts/financial-chart/stock-index-chart/src/app/app.module.ts
index f97766e91..9eaf1528e 100644
--- a/samples/charts/financial-chart/stock-index-chart/src/app/app.module.ts
+++ b/samples/charts/financial-chart/stock-index-chart/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { StockIndexDataService } from "./StockIndexDataService";
     IgxLegendModule
 ],
   providers: [StockIndexDataService],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/financial-chart/styling/package.json b/samples/charts/financial-chart/styling/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/financial-chart/styling/package.json
+++ b/samples/charts/financial-chart/styling/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/styling/src/app/app.module.ts b/samples/charts/financial-chart/styling/src/app/app.module.ts
index c8112d6a0..508b99722 100644
--- a/samples/charts/financial-chart/styling/src/app/app.module.ts
+++ b/samples/charts/financial-chart/styling/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { FinancialDataService } from "./FinancialDataService";
     IgxLegendModule
 ],
   providers: [FinancialDataService],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/financial-chart/theming/package.json b/samples/charts/financial-chart/theming/package.json
index 62c11e08d..c86d18886 100644
--- a/samples/charts/financial-chart/theming/package.json
+++ b/samples/charts/financial-chart/theming/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/theming/src/app/app.module.ts b/samples/charts/financial-chart/theming/src/app/app.module.ts
index e527ab442..21aa96185 100644
--- a/samples/charts/financial-chart/theming/src/app/app.module.ts
+++ b/samples/charts/financial-chart/theming/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { StockDataService } from "./StockDataService";
     IgxLegendModule
 ],
   providers: [StockDataService],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/financial-chart/time-based-data/package.json b/samples/charts/financial-chart/time-based-data/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/financial-chart/time-based-data/package.json
+++ b/samples/charts/financial-chart/time-based-data/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/time-based-data/src/app/app.module.ts b/samples/charts/financial-chart/time-based-data/src/app/app.module.ts
index c8112d6a0..508b99722 100644
--- a/samples/charts/financial-chart/time-based-data/src/app/app.module.ts
+++ b/samples/charts/financial-chart/time-based-data/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { FinancialDataService } from "./FinancialDataService";
     IgxLegendModule
 ],
   providers: [FinancialDataService],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/financial-chart/titles/package.json b/samples/charts/financial-chart/titles/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/financial-chart/titles/package.json
+++ b/samples/charts/financial-chart/titles/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/titles/src/app/app.module.ts b/samples/charts/financial-chart/titles/src/app/app.module.ts
index e527ab442..21aa96185 100644
--- a/samples/charts/financial-chart/titles/src/app/app.module.ts
+++ b/samples/charts/financial-chart/titles/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { StockDataService } from "./StockDataService";
     IgxLegendModule
 ],
   providers: [StockDataService],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/financial-chart/tooltip-template/package.json b/samples/charts/financial-chart/tooltip-template/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/financial-chart/tooltip-template/package.json
+++ b/samples/charts/financial-chart/tooltip-template/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/tooltip-template/src/app/app.module.ts b/samples/charts/financial-chart/tooltip-template/src/app/app.module.ts
index c8112d6a0..508b99722 100644
--- a/samples/charts/financial-chart/tooltip-template/src/app/app.module.ts
+++ b/samples/charts/financial-chart/tooltip-template/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { FinancialDataService } from "./FinancialDataService";
     IgxLegendModule
 ],
   providers: [FinancialDataService],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/financial-chart/tooltip-types/package.json b/samples/charts/financial-chart/tooltip-types/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/financial-chart/tooltip-types/package.json
+++ b/samples/charts/financial-chart/tooltip-types/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/tooltip-types/src/app/app.module.ts b/samples/charts/financial-chart/tooltip-types/src/app/app.module.ts
index c8112d6a0..508b99722 100644
--- a/samples/charts/financial-chart/tooltip-types/src/app/app.module.ts
+++ b/samples/charts/financial-chart/tooltip-types/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { FinancialDataService } from "./FinancialDataService";
     IgxLegendModule
 ],
   providers: [FinancialDataService],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/financial-chart/trendlines/package.json b/samples/charts/financial-chart/trendlines/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/financial-chart/trendlines/package.json
+++ b/samples/charts/financial-chart/trendlines/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/trendlines/src/app/app.module.ts b/samples/charts/financial-chart/trendlines/src/app/app.module.ts
index c8112d6a0..508b99722 100644
--- a/samples/charts/financial-chart/trendlines/src/app/app.module.ts
+++ b/samples/charts/financial-chart/trendlines/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { FinancialDataService } from "./FinancialDataService";
     IgxLegendModule
 ],
   providers: [FinancialDataService],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/financial-chart/volume-types/package.json b/samples/charts/financial-chart/volume-types/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/financial-chart/volume-types/package.json
+++ b/samples/charts/financial-chart/volume-types/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/financial-chart/volume-types/src/app/app.module.ts b/samples/charts/financial-chart/volume-types/src/app/app.module.ts
index c8112d6a0..508b99722 100644
--- a/samples/charts/financial-chart/volume-types/src/app/app.module.ts
+++ b/samples/charts/financial-chart/volume-types/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { FinancialDataService } from "./FinancialDataService";
     IgxLegendModule
 ],
   providers: [FinancialDataService],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/pie-chart/animation/package.json b/samples/charts/pie-chart/animation/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/pie-chart/animation/package.json
+++ b/samples/charts/pie-chart/animation/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/pie-chart/animation/src/app/app.module.ts b/samples/charts/pie-chart/animation/src/app/app.module.ts
index 51cd3616d..92d6a1c8b 100644
--- a/samples/charts/pie-chart/animation/src/app/app.module.ts
+++ b/samples/charts/pie-chart/animation/src/app/app.module.ts
@@ -23,7 +23,6 @@ import { IgxPieChartModule, IgxLegendModule } from "igniteui-angular-charts";
     IgxLegendModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/pie-chart/explosion/package.json b/samples/charts/pie-chart/explosion/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/pie-chart/explosion/package.json
+++ b/samples/charts/pie-chart/explosion/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/pie-chart/explosion/src/app/app.module.ts b/samples/charts/pie-chart/explosion/src/app/app.module.ts
index 51cd3616d..92d6a1c8b 100644
--- a/samples/charts/pie-chart/explosion/src/app/app.module.ts
+++ b/samples/charts/pie-chart/explosion/src/app/app.module.ts
@@ -23,7 +23,6 @@ import { IgxPieChartModule, IgxLegendModule } from "igniteui-angular-charts";
     IgxLegendModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/pie-chart/legend/package.json b/samples/charts/pie-chart/legend/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/pie-chart/legend/package.json
+++ b/samples/charts/pie-chart/legend/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/pie-chart/others/package.json b/samples/charts/pie-chart/others/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/pie-chart/others/package.json
+++ b/samples/charts/pie-chart/others/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/pie-chart/overview/package.json b/samples/charts/pie-chart/overview/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/pie-chart/overview/package.json
+++ b/samples/charts/pie-chart/overview/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/pie-chart/selection/package.json b/samples/charts/pie-chart/selection/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/pie-chart/selection/package.json
+++ b/samples/charts/pie-chart/selection/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/pie-chart/selection/src/app/app.module.ts b/samples/charts/pie-chart/selection/src/app/app.module.ts
index 8b4f71844..fd05556c2 100644
--- a/samples/charts/pie-chart/selection/src/app/app.module.ts
+++ b/samples/charts/pie-chart/selection/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxPieChartModule, IgxLegendModule, IgxItemLegendModule } from "igniteu
     IgxItemLegendModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/pie-chart/styling/package.json b/samples/charts/pie-chart/styling/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/pie-chart/styling/package.json
+++ b/samples/charts/pie-chart/styling/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/sparkline/display-area/package.json b/samples/charts/sparkline/display-area/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/sparkline/display-area/package.json
+++ b/samples/charts/sparkline/display-area/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/sparkline/display-column/package.json b/samples/charts/sparkline/display-column/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/sparkline/display-column/package.json
+++ b/samples/charts/sparkline/display-column/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/sparkline/display-lines/package.json b/samples/charts/sparkline/display-lines/package.json
index 8fdb74bc2..b9695808d 100644
--- a/samples/charts/sparkline/display-lines/package.json
+++ b/samples/charts/sparkline/display-lines/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/sparkline/display-types/package.json b/samples/charts/sparkline/display-types/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/sparkline/display-types/package.json
+++ b/samples/charts/sparkline/display-types/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/sparkline/display-types/src/app/app.module.ts b/samples/charts/sparkline/display-types/src/app/app.module.ts
index e6ef30ab5..6069e2db6 100644
--- a/samples/charts/sparkline/display-types/src/app/app.module.ts
+++ b/samples/charts/sparkline/display-types/src/app/app.module.ts
@@ -22,7 +22,6 @@ import { IgxSparklineModule } from "igniteui-angular-charts";
     IgxSparklineModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/sparkline/display-winloss/package.json b/samples/charts/sparkline/display-winloss/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/sparkline/display-winloss/package.json
+++ b/samples/charts/sparkline/display-winloss/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/sparkline/grid/package.json b/samples/charts/sparkline/grid/package.json
index 3015ff86f..c294e22e4 100644
--- a/samples/charts/sparkline/grid/package.json
+++ b/samples/charts/sparkline/grid/package.json
@@ -20,8 +20,8 @@
     "hammerjs": "2.0.8",
     "igniteui-angular": "16.0.7",
     "igniteui-theming": "1.4.14",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/sparkline/grid/src/app/app.module.ts b/samples/charts/sparkline/grid/src/app/app.module.ts
index 9e3c3305f..89df8edc0 100644
--- a/samples/charts/sparkline/grid/src/app/app.module.ts
+++ b/samples/charts/sparkline/grid/src/app/app.module.ts
@@ -23,7 +23,6 @@ import { Products } from "./Products";
     IgxGridModule
 ],
   providers: [Products],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/sparkline/markers/package.json b/samples/charts/sparkline/markers/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/sparkline/markers/package.json
+++ b/samples/charts/sparkline/markers/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/sparkline/normal-range/package.json b/samples/charts/sparkline/normal-range/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/sparkline/normal-range/package.json
+++ b/samples/charts/sparkline/normal-range/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/sparkline/trendlines/package.json b/samples/charts/sparkline/trendlines/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/sparkline/trendlines/package.json
+++ b/samples/charts/sparkline/trendlines/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/sparkline/unknown-values/package.json b/samples/charts/sparkline/unknown-values/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/sparkline/unknown-values/package.json
+++ b/samples/charts/sparkline/unknown-values/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/toolbar/actions-built-in-category-chart/package.json b/samples/charts/toolbar/actions-built-in-category-chart/package.json
index 8fdb74bc2..b9695808d 100644
--- a/samples/charts/toolbar/actions-built-in-category-chart/package.json
+++ b/samples/charts/toolbar/actions-built-in-category-chart/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/toolbar/actions-built-in-data-chart/package.json b/samples/charts/toolbar/actions-built-in-data-chart/package.json
index 8fdb74bc2..b9695808d 100644
--- a/samples/charts/toolbar/actions-built-in-data-chart/package.json
+++ b/samples/charts/toolbar/actions-built-in-data-chart/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/toolbar/layout-actions-for-data-chart/package.json b/samples/charts/toolbar/layout-actions-for-data-chart/package.json
index 8fdb74bc2..b9695808d 100644
--- a/samples/charts/toolbar/layout-actions-for-data-chart/package.json
+++ b/samples/charts/toolbar/layout-actions-for-data-chart/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/toolbar/layout-in-vertical-orientation/package.json b/samples/charts/toolbar/layout-in-vertical-orientation/package.json
index 8fdb74bc2..b9695808d 100644
--- a/samples/charts/toolbar/layout-in-vertical-orientation/package.json
+++ b/samples/charts/toolbar/layout-in-vertical-orientation/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/toolbar/theming/package.json b/samples/charts/toolbar/theming/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/toolbar/theming/package.json
+++ b/samples/charts/toolbar/theming/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/tree-map/events/package.json b/samples/charts/tree-map/events/package.json
index 0a49f3cd0..e1b63b3e7 100644
--- a/samples/charts/tree-map/events/package.json
+++ b/samples/charts/tree-map/events/package.json
@@ -19,8 +19,8 @@
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
     "igniteui-angular": "16.0.7",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/tree-map/events/src/app/app.module.ts b/samples/charts/tree-map/events/src/app/app.module.ts
index 1fbade143..5dd024b4d 100644
--- a/samples/charts/tree-map/events/src/app/app.module.ts
+++ b/samples/charts/tree-map/events/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxButtonModule } from "igniteui-angular";
     IgxButtonModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/charts/tree-map/layout/package.json b/samples/charts/tree-map/layout/package.json
index 25a657367..4af23ebf5 100644
--- a/samples/charts/tree-map/layout/package.json
+++ b/samples/charts/tree-map/layout/package.json
@@ -18,10 +18,10 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-layouts": "16.1.0",
-    "igniteui-angular-inputs": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-layouts": "23.2.18",
+    "@infragistics/igniteui-angular-inputs": "23.2.18",
     "igniteui-webcomponents": "4.3.0-beta.0",
     "intl": "1.2.5",
     "jszip": "3.7.1",
diff --git a/samples/charts/tree-map/overview/package.json b/samples/charts/tree-map/overview/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/tree-map/overview/package.json
+++ b/samples/charts/tree-map/overview/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/tree-map/styling/package.json b/samples/charts/tree-map/styling/package.json
index 07e12d1ce..6b8de9771 100644
--- a/samples/charts/tree-map/styling/package.json
+++ b/samples/charts/tree-map/styling/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/zoomslider/overview/package.json b/samples/charts/zoomslider/overview/package.json
index 8f8254a17..75be1a865 100644
--- a/samples/charts/zoomslider/overview/package.json
+++ b/samples/charts/zoomslider/overview/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/charts/zoomslider/overview/src/app/app.module.ts b/samples/charts/zoomslider/overview/src/app/app.module.ts
index 64da61aa5..22794a16a 100644
--- a/samples/charts/zoomslider/overview/src/app/app.module.ts
+++ b/samples/charts/zoomslider/overview/src/app/app.module.ts
@@ -36,7 +36,6 @@ import { SampleScatterStats } from "./SampleScatterStats";
     IgxBubbleSeriesModule
 ],
   providers: [SampleScatterStats],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/excel/excel-library/operations-on-workbooks/package.json b/samples/excel/excel-library/operations-on-workbooks/package.json
index 862738902..70ebed7e7 100644
--- a/samples/excel/excel-library/operations-on-workbooks/package.json
+++ b/samples/excel/excel-library/operations-on-workbooks/package.json
@@ -21,8 +21,8 @@
     "file-saver": "2.0.5",
     "hammerjs": "2.0.8",
     "igniteui-angular": "16.0.7",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-excel": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-excel": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/excel/excel-library/operations-on-workbooks/src/app/app.module.ts b/samples/excel/excel-library/operations-on-workbooks/src/app/app.module.ts
index 1bbd128c7..8e2ee6719 100644
--- a/samples/excel/excel-library/operations-on-workbooks/src/app/app.module.ts
+++ b/samples/excel/excel-library/operations-on-workbooks/src/app/app.module.ts
@@ -23,7 +23,6 @@ import { IgxExcelModule } from "igniteui-angular-excel";
     IgxExcelModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/excel/excel-library/operations-on-worksheets/package.json b/samples/excel/excel-library/operations-on-worksheets/package.json
index b1bd57ee7..cd9f64d7f 100644
--- a/samples/excel/excel-library/operations-on-worksheets/package.json
+++ b/samples/excel/excel-library/operations-on-worksheets/package.json
@@ -20,8 +20,8 @@
     "core-js": "2.6.2",
     "file-saver": "2.0.5",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-excel": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-excel": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/excel/excel-library/operations-on-worksheets/src/app/app.module.ts b/samples/excel/excel-library/operations-on-worksheets/src/app/app.module.ts
index 911fcd896..ffa2a25c8 100644
--- a/samples/excel/excel-library/operations-on-worksheets/src/app/app.module.ts
+++ b/samples/excel/excel-library/operations-on-worksheets/src/app/app.module.ts
@@ -20,7 +20,6 @@ import { IgxExcelModule } from "igniteui-angular-excel";
     IgxExcelModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/excel/excel-library/overview/package.json b/samples/excel/excel-library/overview/package.json
index b1bd57ee7..cd9f64d7f 100644
--- a/samples/excel/excel-library/overview/package.json
+++ b/samples/excel/excel-library/overview/package.json
@@ -20,8 +20,8 @@
     "core-js": "2.6.2",
     "file-saver": "2.0.5",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-excel": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-excel": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/excel/excel-library/overview/src/app/app.module.ts b/samples/excel/excel-library/overview/src/app/app.module.ts
index 9147cd6ef..6c52fb732 100644
--- a/samples/excel/excel-library/overview/src/app/app.module.ts
+++ b/samples/excel/excel-library/overview/src/app/app.module.ts
@@ -16,7 +16,6 @@ import { IgxExcelModule } from "igniteui-angular-excel";
     IgxExcelModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/excel/excel-library/working-with-cells/package.json b/samples/excel/excel-library/working-with-cells/package.json
index b1bd57ee7..cd9f64d7f 100644
--- a/samples/excel/excel-library/working-with-cells/package.json
+++ b/samples/excel/excel-library/working-with-cells/package.json
@@ -20,8 +20,8 @@
     "core-js": "2.6.2",
     "file-saver": "2.0.5",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-excel": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-excel": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/excel/excel-library/working-with-cells/src/app/app.module.ts b/samples/excel/excel-library/working-with-cells/src/app/app.module.ts
index 911fcd896..ffa2a25c8 100644
--- a/samples/excel/excel-library/working-with-cells/src/app/app.module.ts
+++ b/samples/excel/excel-library/working-with-cells/src/app/app.module.ts
@@ -20,7 +20,6 @@ import { IgxExcelModule } from "igniteui-angular-excel";
     IgxExcelModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/excel/excel-library/working-with-charts/package.json b/samples/excel/excel-library/working-with-charts/package.json
index 7e54683e3..f7c5a28c4 100644
--- a/samples/excel/excel-library/working-with-charts/package.json
+++ b/samples/excel/excel-library/working-with-charts/package.json
@@ -21,9 +21,9 @@
     "file-saver": "2.0.5",
     "hammerjs": "2.0.8",
     "igniteui-angular": "16.0.7",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-excel": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-excel": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/excel/excel-library/working-with-charts/src/app/app.module.ts b/samples/excel/excel-library/working-with-charts/src/app/app.module.ts
index e377f24d2..2085be758 100644
--- a/samples/excel/excel-library/working-with-charts/src/app/app.module.ts
+++ b/samples/excel/excel-library/working-with-charts/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxExcelModule } from "igniteui-angular-excel";
     IgxExcelModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/excel/excel-library/working-with-sparklines/package.json b/samples/excel/excel-library/working-with-sparklines/package.json
index 3ee423ae4..861be2b53 100644
--- a/samples/excel/excel-library/working-with-sparklines/package.json
+++ b/samples/excel/excel-library/working-with-sparklines/package.json
@@ -21,9 +21,9 @@
     "file-saver": "2.0.5",
     "hammerjs": "2.0.8",
     "igniteui-angular": "16.0.7",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-excel": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-excel": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/excel/excel-library/working-with-sparklines/src/app/app.module.ts b/samples/excel/excel-library/working-with-sparklines/src/app/app.module.ts
index 15091b9e1..41ac64541 100644
--- a/samples/excel/excel-library/working-with-sparklines/src/app/app.module.ts
+++ b/samples/excel/excel-library/working-with-sparklines/src/app/app.module.ts
@@ -25,7 +25,6 @@ import { IgxExcelModule } from "igniteui-angular-excel";
     IgxExcelModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/excel/excel-library/working-with-tables/package.json b/samples/excel/excel-library/working-with-tables/package.json
index e52cd3355..1aa697b76 100644
--- a/samples/excel/excel-library/working-with-tables/package.json
+++ b/samples/excel/excel-library/working-with-tables/package.json
@@ -20,10 +20,10 @@
     "core-js": "2.6.2",
     "file-saver": "2.0.5",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-excel": "16.1.0",
-    "igniteui-angular-spreadsheet": "16.1.0",
-    "igniteui-angular-spreadsheet-chart-adapter": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-excel": "23.2.18",
+    "@infragistics/igniteui-angular-spreadsheet": "23.2.18",
+    "@infragistics/igniteui-angular-spreadsheet-chart-adapter": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/excel/excel-library/working-with-tables/src/app/app.module.ts b/samples/excel/excel-library/working-with-tables/src/app/app.module.ts
index d881ed32b..124e680e8 100644
--- a/samples/excel/excel-library/working-with-tables/src/app/app.module.ts
+++ b/samples/excel/excel-library/working-with-tables/src/app/app.module.ts
@@ -21,7 +21,6 @@ import { ExcelUtility } from "./ExcelUtility";
     IgxExcelModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/excel/spreadsheet/activation/package.json b/samples/excel/spreadsheet/activation/package.json
index 0152cc3c3..dc8fcbdb8 100644
--- a/samples/excel/spreadsheet/activation/package.json
+++ b/samples/excel/spreadsheet/activation/package.json
@@ -20,9 +20,9 @@
     "core-js": "2.6.2",
     "file-saver": "2.0.5",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-excel": "16.1.0",
-    "igniteui-angular-spreadsheet": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-excel": "23.2.18",
+    "@infragistics/igniteui-angular-spreadsheet": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/excel/spreadsheet/activation/src/app/app.module.ts b/samples/excel/spreadsheet/activation/src/app/app.module.ts
index 8959b6937..fdc6eea0f 100644
--- a/samples/excel/spreadsheet/activation/src/app/app.module.ts
+++ b/samples/excel/spreadsheet/activation/src/app/app.module.ts
@@ -23,7 +23,6 @@ import { IgxSpreadsheetModule } from "igniteui-angular-spreadsheet";
     IgxSpreadsheetModule
 ],
   providers: [ExcelUtility],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/excel/spreadsheet/adapter-chart/package.json b/samples/excel/spreadsheet/adapter-chart/package.json
index 2b97d8a03..8373c85bc 100644
--- a/samples/excel/spreadsheet/adapter-chart/package.json
+++ b/samples/excel/spreadsheet/adapter-chart/package.json
@@ -20,11 +20,11 @@
     "core-js": "2.6.2",
     "file-saver": "2.0.5",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-excel": "16.1.0",
-    "igniteui-angular-spreadsheet": "16.1.0",
-    "igniteui-angular-spreadsheet-chart-adapter": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-excel": "23.2.18",
+    "@infragistics/igniteui-angular-spreadsheet": "23.2.18",
+    "@infragistics/igniteui-angular-spreadsheet-chart-adapter": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/excel/spreadsheet/adapter-chart/src/app/app.module.ts b/samples/excel/spreadsheet/adapter-chart/src/app/app.module.ts
index 463851008..c957dfa1d 100644
--- a/samples/excel/spreadsheet/adapter-chart/src/app/app.module.ts
+++ b/samples/excel/spreadsheet/adapter-chart/src/app/app.module.ts
@@ -25,7 +25,6 @@ import { IgxSpreadsheetChartAdapterModule } from "igniteui-angular-spreadsheet-c
     IgxSpreadsheetChartAdapterModule
 ],
   providers: [ExcelUtility],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/excel/spreadsheet/adapter-combo/package.json b/samples/excel/spreadsheet/adapter-combo/package.json
index d91f509e1..a98ded73a 100644
--- a/samples/excel/spreadsheet/adapter-combo/package.json
+++ b/samples/excel/spreadsheet/adapter-combo/package.json
@@ -20,11 +20,11 @@
     "core-js": "2.6.2",
     "file-saver": "2.0.5",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-excel": "16.1.0",
-    "igniteui-angular-spreadsheet": "16.1.0",
-    "igniteui-angular-spreadsheet-chart-adapter": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-excel": "23.2.18",
+    "@infragistics/igniteui-angular-spreadsheet": "23.2.18",
+    "@infragistics/igniteui-angular-spreadsheet-chart-adapter": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/excel/spreadsheet/adapter-combo/src/app/app.module.ts b/samples/excel/spreadsheet/adapter-combo/src/app/app.module.ts
index 463851008..c957dfa1d 100644
--- a/samples/excel/spreadsheet/adapter-combo/src/app/app.module.ts
+++ b/samples/excel/spreadsheet/adapter-combo/src/app/app.module.ts
@@ -25,7 +25,6 @@ import { IgxSpreadsheetChartAdapterModule } from "igniteui-angular-spreadsheet-c
     IgxSpreadsheetChartAdapterModule
 ],
   providers: [ExcelUtility],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/excel/spreadsheet/clipboard/package.json b/samples/excel/spreadsheet/clipboard/package.json
index 6ef540c9c..a0fe8e359 100644
--- a/samples/excel/spreadsheet/clipboard/package.json
+++ b/samples/excel/spreadsheet/clipboard/package.json
@@ -20,9 +20,9 @@
     "core-js": "2.6.2",
     "file-saver": "2.0.5",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-excel": "16.1.0",
-    "igniteui-angular-spreadsheet": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-excel": "23.2.18",
+    "@infragistics/igniteui-angular-spreadsheet": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/excel/spreadsheet/clipboard/src/app/app.module.ts b/samples/excel/spreadsheet/clipboard/src/app/app.module.ts
index 8959b6937..fdc6eea0f 100644
--- a/samples/excel/spreadsheet/clipboard/src/app/app.module.ts
+++ b/samples/excel/spreadsheet/clipboard/src/app/app.module.ts
@@ -23,7 +23,6 @@ import { IgxSpreadsheetModule } from "igniteui-angular-spreadsheet";
     IgxSpreadsheetModule
 ],
   providers: [ExcelUtility],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/excel/spreadsheet/commands/package.json b/samples/excel/spreadsheet/commands/package.json
index 6ef540c9c..a0fe8e359 100644
--- a/samples/excel/spreadsheet/commands/package.json
+++ b/samples/excel/spreadsheet/commands/package.json
@@ -20,9 +20,9 @@
     "core-js": "2.6.2",
     "file-saver": "2.0.5",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-excel": "16.1.0",
-    "igniteui-angular-spreadsheet": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-excel": "23.2.18",
+    "@infragistics/igniteui-angular-spreadsheet": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/excel/spreadsheet/commands/src/app/app.module.ts b/samples/excel/spreadsheet/commands/src/app/app.module.ts
index 8959b6937..fdc6eea0f 100644
--- a/samples/excel/spreadsheet/commands/src/app/app.module.ts
+++ b/samples/excel/spreadsheet/commands/src/app/app.module.ts
@@ -23,7 +23,6 @@ import { IgxSpreadsheetModule } from "igniteui-angular-spreadsheet";
     IgxSpreadsheetModule
 ],
   providers: [ExcelUtility],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/excel/spreadsheet/conditional-formatting/package.json b/samples/excel/spreadsheet/conditional-formatting/package.json
index 6ef540c9c..a0fe8e359 100644
--- a/samples/excel/spreadsheet/conditional-formatting/package.json
+++ b/samples/excel/spreadsheet/conditional-formatting/package.json
@@ -20,9 +20,9 @@
     "core-js": "2.6.2",
     "file-saver": "2.0.5",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-excel": "16.1.0",
-    "igniteui-angular-spreadsheet": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-excel": "23.2.18",
+    "@infragistics/igniteui-angular-spreadsheet": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/excel/spreadsheet/conditional-formatting/src/app/app.module.ts b/samples/excel/spreadsheet/conditional-formatting/src/app/app.module.ts
index 8959b6937..fdc6eea0f 100644
--- a/samples/excel/spreadsheet/conditional-formatting/src/app/app.module.ts
+++ b/samples/excel/spreadsheet/conditional-formatting/src/app/app.module.ts
@@ -23,7 +23,6 @@ import { IgxSpreadsheetModule } from "igniteui-angular-spreadsheet";
     IgxSpreadsheetModule
 ],
   providers: [ExcelUtility],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/excel/spreadsheet/config-options/package.json b/samples/excel/spreadsheet/config-options/package.json
index 6ef540c9c..a0fe8e359 100644
--- a/samples/excel/spreadsheet/config-options/package.json
+++ b/samples/excel/spreadsheet/config-options/package.json
@@ -20,9 +20,9 @@
     "core-js": "2.6.2",
     "file-saver": "2.0.5",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-excel": "16.1.0",
-    "igniteui-angular-spreadsheet": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-excel": "23.2.18",
+    "@infragistics/igniteui-angular-spreadsheet": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/excel/spreadsheet/config-options/src/app/app.module.ts b/samples/excel/spreadsheet/config-options/src/app/app.module.ts
index 8959b6937..fdc6eea0f 100644
--- a/samples/excel/spreadsheet/config-options/src/app/app.module.ts
+++ b/samples/excel/spreadsheet/config-options/src/app/app.module.ts
@@ -23,7 +23,6 @@ import { IgxSpreadsheetModule } from "igniteui-angular-spreadsheet";
     IgxSpreadsheetModule
 ],
   providers: [ExcelUtility],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/excel/spreadsheet/data-validation/package.json b/samples/excel/spreadsheet/data-validation/package.json
index 6ef540c9c..a0fe8e359 100644
--- a/samples/excel/spreadsheet/data-validation/package.json
+++ b/samples/excel/spreadsheet/data-validation/package.json
@@ -20,9 +20,9 @@
     "core-js": "2.6.2",
     "file-saver": "2.0.5",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-excel": "16.1.0",
-    "igniteui-angular-spreadsheet": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-excel": "23.2.18",
+    "@infragistics/igniteui-angular-spreadsheet": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/excel/spreadsheet/data-validation/src/app/app.module.ts b/samples/excel/spreadsheet/data-validation/src/app/app.module.ts
index 1bc8c9ede..16a60280a 100644
--- a/samples/excel/spreadsheet/data-validation/src/app/app.module.ts
+++ b/samples/excel/spreadsheet/data-validation/src/app/app.module.ts
@@ -22,7 +22,6 @@ import { IgxSpreadsheetModule } from "igniteui-angular-spreadsheet";
     IgxSpreadsheetModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/excel/spreadsheet/hyperlinks/package.json b/samples/excel/spreadsheet/hyperlinks/package.json
index 0152cc3c3..dc8fcbdb8 100644
--- a/samples/excel/spreadsheet/hyperlinks/package.json
+++ b/samples/excel/spreadsheet/hyperlinks/package.json
@@ -20,9 +20,9 @@
     "core-js": "2.6.2",
     "file-saver": "2.0.5",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-excel": "16.1.0",
-    "igniteui-angular-spreadsheet": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-excel": "23.2.18",
+    "@infragistics/igniteui-angular-spreadsheet": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/excel/spreadsheet/hyperlinks/src/app/app.module.ts b/samples/excel/spreadsheet/hyperlinks/src/app/app.module.ts
index 8959b6937..fdc6eea0f 100644
--- a/samples/excel/spreadsheet/hyperlinks/src/app/app.module.ts
+++ b/samples/excel/spreadsheet/hyperlinks/src/app/app.module.ts
@@ -23,7 +23,6 @@ import { IgxSpreadsheetModule } from "igniteui-angular-spreadsheet";
     IgxSpreadsheetModule
 ],
   providers: [ExcelUtility],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/excel/spreadsheet/overview/package.json b/samples/excel/spreadsheet/overview/package.json
index 0152cc3c3..dc8fcbdb8 100644
--- a/samples/excel/spreadsheet/overview/package.json
+++ b/samples/excel/spreadsheet/overview/package.json
@@ -20,9 +20,9 @@
     "core-js": "2.6.2",
     "file-saver": "2.0.5",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-excel": "16.1.0",
-    "igniteui-angular-spreadsheet": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-excel": "23.2.18",
+    "@infragistics/igniteui-angular-spreadsheet": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/excel/spreadsheet/overview/src/app/app.module.ts b/samples/excel/spreadsheet/overview/src/app/app.module.ts
index 8959b6937..fdc6eea0f 100644
--- a/samples/excel/spreadsheet/overview/src/app/app.module.ts
+++ b/samples/excel/spreadsheet/overview/src/app/app.module.ts
@@ -23,7 +23,6 @@ import { IgxSpreadsheetModule } from "igniteui-angular-spreadsheet";
     IgxSpreadsheetModule
 ],
   providers: [ExcelUtility],
-  entryComponents: [],
-  schemas: []
+schemas: []
 })
 export class AppModule {}
diff --git a/samples/gauges/bullet-graph/animation/package.json b/samples/gauges/bullet-graph/animation/package.json
index 2f21c43c5..7c7b539ed 100644
--- a/samples/gauges/bullet-graph/animation/package.json
+++ b/samples/gauges/bullet-graph/animation/package.json
@@ -19,8 +19,8 @@
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
     "igniteui-angular": "16.0.7",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-gauges": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-gauges": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/gauges/bullet-graph/animation/src/app/app.module.ts b/samples/gauges/bullet-graph/animation/src/app/app.module.ts
index 2e3e1ef7a..1d5183b7e 100644
--- a/samples/gauges/bullet-graph/animation/src/app/app.module.ts
+++ b/samples/gauges/bullet-graph/animation/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxButtonModule } from "igniteui-angular";
     IgxButtonModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/gauges/bullet-graph/background/package.json b/samples/gauges/bullet-graph/background/package.json
index d32c26900..2cc863b40 100644
--- a/samples/gauges/bullet-graph/background/package.json
+++ b/samples/gauges/bullet-graph/background/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-gauges": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-gauges": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/gauges/bullet-graph/background/src/app/app.module.ts b/samples/gauges/bullet-graph/background/src/app/app.module.ts
index ad34e38b7..5a475ba9e 100644
--- a/samples/gauges/bullet-graph/background/src/app/app.module.ts
+++ b/samples/gauges/bullet-graph/background/src/app/app.module.ts
@@ -21,7 +21,6 @@ import { IgxBulletGraphModule } from "igniteui-angular-gauges";
     IgxBulletGraphModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/gauges/bullet-graph/labels/package.json b/samples/gauges/bullet-graph/labels/package.json
index d32c26900..2cc863b40 100644
--- a/samples/gauges/bullet-graph/labels/package.json
+++ b/samples/gauges/bullet-graph/labels/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-gauges": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-gauges": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/gauges/bullet-graph/labels/src/app/app.module.ts b/samples/gauges/bullet-graph/labels/src/app/app.module.ts
index ad34e38b7..5a475ba9e 100644
--- a/samples/gauges/bullet-graph/labels/src/app/app.module.ts
+++ b/samples/gauges/bullet-graph/labels/src/app/app.module.ts
@@ -21,7 +21,6 @@ import { IgxBulletGraphModule } from "igniteui-angular-gauges";
     IgxBulletGraphModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/gauges/bullet-graph/measures/package.json b/samples/gauges/bullet-graph/measures/package.json
index d32c26900..2cc863b40 100644
--- a/samples/gauges/bullet-graph/measures/package.json
+++ b/samples/gauges/bullet-graph/measures/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-gauges": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-gauges": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/gauges/bullet-graph/measures/src/app/app.module.ts b/samples/gauges/bullet-graph/measures/src/app/app.module.ts
index ad34e38b7..5a475ba9e 100644
--- a/samples/gauges/bullet-graph/measures/src/app/app.module.ts
+++ b/samples/gauges/bullet-graph/measures/src/app/app.module.ts
@@ -21,7 +21,6 @@ import { IgxBulletGraphModule } from "igniteui-angular-gauges";
     IgxBulletGraphModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/gauges/bullet-graph/ranges/package.json b/samples/gauges/bullet-graph/ranges/package.json
index d32c26900..2cc863b40 100644
--- a/samples/gauges/bullet-graph/ranges/package.json
+++ b/samples/gauges/bullet-graph/ranges/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-gauges": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-gauges": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/gauges/bullet-graph/ranges/src/app/app.module.ts b/samples/gauges/bullet-graph/ranges/src/app/app.module.ts
index ad34e38b7..5a475ba9e 100644
--- a/samples/gauges/bullet-graph/ranges/src/app/app.module.ts
+++ b/samples/gauges/bullet-graph/ranges/src/app/app.module.ts
@@ -21,7 +21,6 @@ import { IgxBulletGraphModule } from "igniteui-angular-gauges";
     IgxBulletGraphModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/gauges/bullet-graph/scale/package.json b/samples/gauges/bullet-graph/scale/package.json
index d32c26900..2cc863b40 100644
--- a/samples/gauges/bullet-graph/scale/package.json
+++ b/samples/gauges/bullet-graph/scale/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-gauges": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-gauges": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/gauges/bullet-graph/scale/src/app/app.module.ts b/samples/gauges/bullet-graph/scale/src/app/app.module.ts
index ad34e38b7..5a475ba9e 100644
--- a/samples/gauges/bullet-graph/scale/src/app/app.module.ts
+++ b/samples/gauges/bullet-graph/scale/src/app/app.module.ts
@@ -21,7 +21,6 @@ import { IgxBulletGraphModule } from "igniteui-angular-gauges";
     IgxBulletGraphModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/gauges/bullet-graph/tickmarks/package.json b/samples/gauges/bullet-graph/tickmarks/package.json
index d32c26900..2cc863b40 100644
--- a/samples/gauges/bullet-graph/tickmarks/package.json
+++ b/samples/gauges/bullet-graph/tickmarks/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-gauges": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-gauges": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/gauges/bullet-graph/tickmarks/src/app/app.module.ts b/samples/gauges/bullet-graph/tickmarks/src/app/app.module.ts
index ad34e38b7..5a475ba9e 100644
--- a/samples/gauges/bullet-graph/tickmarks/src/app/app.module.ts
+++ b/samples/gauges/bullet-graph/tickmarks/src/app/app.module.ts
@@ -21,7 +21,6 @@ import { IgxBulletGraphModule } from "igniteui-angular-gauges";
     IgxBulletGraphModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/gauges/linear-gauge/animation/package.json b/samples/gauges/linear-gauge/animation/package.json
index 2f21c43c5..7c7b539ed 100644
--- a/samples/gauges/linear-gauge/animation/package.json
+++ b/samples/gauges/linear-gauge/animation/package.json
@@ -19,8 +19,8 @@
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
     "igniteui-angular": "16.0.7",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-gauges": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-gauges": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/gauges/linear-gauge/animation/src/app/app.module.ts b/samples/gauges/linear-gauge/animation/src/app/app.module.ts
index 829cdf500..a5e80a545 100644
--- a/samples/gauges/linear-gauge/animation/src/app/app.module.ts
+++ b/samples/gauges/linear-gauge/animation/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxButtonModule } from "igniteui-angular";
     IgxButtonModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/gauges/linear-gauge/backing/package.json b/samples/gauges/linear-gauge/backing/package.json
index d32c26900..2cc863b40 100644
--- a/samples/gauges/linear-gauge/backing/package.json
+++ b/samples/gauges/linear-gauge/backing/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-gauges": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-gauges": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/gauges/linear-gauge/backing/src/app/app.module.ts b/samples/gauges/linear-gauge/backing/src/app/app.module.ts
index 74472565b..fa0236237 100644
--- a/samples/gauges/linear-gauge/backing/src/app/app.module.ts
+++ b/samples/gauges/linear-gauge/backing/src/app/app.module.ts
@@ -21,7 +21,6 @@ import { IgxLinearGaugeModule } from "igniteui-angular-gauges";
     IgxLinearGaugeModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/gauges/linear-gauge/labels/package.json b/samples/gauges/linear-gauge/labels/package.json
index d32c26900..2cc863b40 100644
--- a/samples/gauges/linear-gauge/labels/package.json
+++ b/samples/gauges/linear-gauge/labels/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-gauges": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-gauges": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/gauges/linear-gauge/labels/src/app/app.module.ts b/samples/gauges/linear-gauge/labels/src/app/app.module.ts
index 74472565b..fa0236237 100644
--- a/samples/gauges/linear-gauge/labels/src/app/app.module.ts
+++ b/samples/gauges/linear-gauge/labels/src/app/app.module.ts
@@ -21,7 +21,6 @@ import { IgxLinearGaugeModule } from "igniteui-angular-gauges";
     IgxLinearGaugeModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/gauges/linear-gauge/needle/package.json b/samples/gauges/linear-gauge/needle/package.json
index d32c26900..2cc863b40 100644
--- a/samples/gauges/linear-gauge/needle/package.json
+++ b/samples/gauges/linear-gauge/needle/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-gauges": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-gauges": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/gauges/linear-gauge/needle/src/app/app.module.ts b/samples/gauges/linear-gauge/needle/src/app/app.module.ts
index 74472565b..fa0236237 100644
--- a/samples/gauges/linear-gauge/needle/src/app/app.module.ts
+++ b/samples/gauges/linear-gauge/needle/src/app/app.module.ts
@@ -21,7 +21,6 @@ import { IgxLinearGaugeModule } from "igniteui-angular-gauges";
     IgxLinearGaugeModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/gauges/linear-gauge/ranges/package.json b/samples/gauges/linear-gauge/ranges/package.json
index d32c26900..2cc863b40 100644
--- a/samples/gauges/linear-gauge/ranges/package.json
+++ b/samples/gauges/linear-gauge/ranges/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-gauges": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-gauges": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/gauges/linear-gauge/ranges/src/app/app.module.ts b/samples/gauges/linear-gauge/ranges/src/app/app.module.ts
index 74472565b..fa0236237 100644
--- a/samples/gauges/linear-gauge/ranges/src/app/app.module.ts
+++ b/samples/gauges/linear-gauge/ranges/src/app/app.module.ts
@@ -21,7 +21,6 @@ import { IgxLinearGaugeModule } from "igniteui-angular-gauges";
     IgxLinearGaugeModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/gauges/linear-gauge/scale/package.json b/samples/gauges/linear-gauge/scale/package.json
index d32c26900..2cc863b40 100644
--- a/samples/gauges/linear-gauge/scale/package.json
+++ b/samples/gauges/linear-gauge/scale/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-gauges": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-gauges": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/gauges/linear-gauge/scale/src/app/app.module.ts b/samples/gauges/linear-gauge/scale/src/app/app.module.ts
index 74472565b..fa0236237 100644
--- a/samples/gauges/linear-gauge/scale/src/app/app.module.ts
+++ b/samples/gauges/linear-gauge/scale/src/app/app.module.ts
@@ -21,7 +21,6 @@ import { IgxLinearGaugeModule } from "igniteui-angular-gauges";
     IgxLinearGaugeModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/gauges/linear-gauge/tickmarks/package.json b/samples/gauges/linear-gauge/tickmarks/package.json
index d32c26900..2cc863b40 100644
--- a/samples/gauges/linear-gauge/tickmarks/package.json
+++ b/samples/gauges/linear-gauge/tickmarks/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-gauges": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-gauges": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/gauges/linear-gauge/tickmarks/src/app/app.module.ts b/samples/gauges/linear-gauge/tickmarks/src/app/app.module.ts
index 74472565b..fa0236237 100644
--- a/samples/gauges/linear-gauge/tickmarks/src/app/app.module.ts
+++ b/samples/gauges/linear-gauge/tickmarks/src/app/app.module.ts
@@ -21,7 +21,6 @@ import { IgxLinearGaugeModule } from "igniteui-angular-gauges";
     IgxLinearGaugeModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/gauges/radial-gauge/animation/package.json b/samples/gauges/radial-gauge/animation/package.json
index 2f21c43c5..7c7b539ed 100644
--- a/samples/gauges/radial-gauge/animation/package.json
+++ b/samples/gauges/radial-gauge/animation/package.json
@@ -19,8 +19,8 @@
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
     "igniteui-angular": "16.0.7",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-gauges": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-gauges": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/gauges/radial-gauge/animation/src/app/app.module.ts b/samples/gauges/radial-gauge/animation/src/app/app.module.ts
index e1233680b..f25aef69b 100644
--- a/samples/gauges/radial-gauge/animation/src/app/app.module.ts
+++ b/samples/gauges/radial-gauge/animation/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxButtonModule } from "igniteui-angular";
     IgxButtonModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/gauges/radial-gauge/backing/package.json b/samples/gauges/radial-gauge/backing/package.json
index d32c26900..2cc863b40 100644
--- a/samples/gauges/radial-gauge/backing/package.json
+++ b/samples/gauges/radial-gauge/backing/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-gauges": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-gauges": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/gauges/radial-gauge/backing/src/app/app.module.ts b/samples/gauges/radial-gauge/backing/src/app/app.module.ts
index 5688d7ace..475cc318f 100644
--- a/samples/gauges/radial-gauge/backing/src/app/app.module.ts
+++ b/samples/gauges/radial-gauge/backing/src/app/app.module.ts
@@ -21,7 +21,6 @@ import { IgxRadialGaugeModule } from "igniteui-angular-gauges";
     IgxRadialGaugeModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/gauges/radial-gauge/labels/package.json b/samples/gauges/radial-gauge/labels/package.json
index d32c26900..2cc863b40 100644
--- a/samples/gauges/radial-gauge/labels/package.json
+++ b/samples/gauges/radial-gauge/labels/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-gauges": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-gauges": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/gauges/radial-gauge/labels/src/app/app.module.ts b/samples/gauges/radial-gauge/labels/src/app/app.module.ts
index 5688d7ace..475cc318f 100644
--- a/samples/gauges/radial-gauge/labels/src/app/app.module.ts
+++ b/samples/gauges/radial-gauge/labels/src/app/app.module.ts
@@ -21,7 +21,6 @@ import { IgxRadialGaugeModule } from "igniteui-angular-gauges";
     IgxRadialGaugeModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/gauges/radial-gauge/needle/package.json b/samples/gauges/radial-gauge/needle/package.json
index d32c26900..2cc863b40 100644
--- a/samples/gauges/radial-gauge/needle/package.json
+++ b/samples/gauges/radial-gauge/needle/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-gauges": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-gauges": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/gauges/radial-gauge/needle/src/app/app.module.ts b/samples/gauges/radial-gauge/needle/src/app/app.module.ts
index 5688d7ace..475cc318f 100644
--- a/samples/gauges/radial-gauge/needle/src/app/app.module.ts
+++ b/samples/gauges/radial-gauge/needle/src/app/app.module.ts
@@ -21,7 +21,6 @@ import { IgxRadialGaugeModule } from "igniteui-angular-gauges";
     IgxRadialGaugeModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/gauges/radial-gauge/ranges/package.json b/samples/gauges/radial-gauge/ranges/package.json
index d32c26900..2cc863b40 100644
--- a/samples/gauges/radial-gauge/ranges/package.json
+++ b/samples/gauges/radial-gauge/ranges/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-gauges": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-gauges": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/gauges/radial-gauge/ranges/src/app/app.module.ts b/samples/gauges/radial-gauge/ranges/src/app/app.module.ts
index 5688d7ace..475cc318f 100644
--- a/samples/gauges/radial-gauge/ranges/src/app/app.module.ts
+++ b/samples/gauges/radial-gauge/ranges/src/app/app.module.ts
@@ -21,7 +21,6 @@ import { IgxRadialGaugeModule } from "igniteui-angular-gauges";
     IgxRadialGaugeModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/gauges/radial-gauge/scale/package.json b/samples/gauges/radial-gauge/scale/package.json
index d32c26900..2cc863b40 100644
--- a/samples/gauges/radial-gauge/scale/package.json
+++ b/samples/gauges/radial-gauge/scale/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-gauges": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-gauges": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/gauges/radial-gauge/scale/src/app/app.module.ts b/samples/gauges/radial-gauge/scale/src/app/app.module.ts
index 5688d7ace..475cc318f 100644
--- a/samples/gauges/radial-gauge/scale/src/app/app.module.ts
+++ b/samples/gauges/radial-gauge/scale/src/app/app.module.ts
@@ -21,7 +21,6 @@ import { IgxRadialGaugeModule } from "igniteui-angular-gauges";
     IgxRadialGaugeModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/gauges/radial-gauge/tickmarks/package.json b/samples/gauges/radial-gauge/tickmarks/package.json
index d32c26900..2cc863b40 100644
--- a/samples/gauges/radial-gauge/tickmarks/package.json
+++ b/samples/gauges/radial-gauge/tickmarks/package.json
@@ -18,8 +18,8 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-gauges": "16.1.0",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-gauges": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/gauges/radial-gauge/tickmarks/src/app/app.module.ts b/samples/gauges/radial-gauge/tickmarks/src/app/app.module.ts
index 5688d7ace..475cc318f 100644
--- a/samples/gauges/radial-gauge/tickmarks/src/app/app.module.ts
+++ b/samples/gauges/radial-gauge/tickmarks/src/app/app.module.ts
@@ -21,7 +21,6 @@ import { IgxRadialGaugeModule } from "igniteui-angular-gauges";
     IgxRadialGaugeModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/binding-data-csv/package.json b/samples/maps/geo-map/binding-data-csv/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/binding-data-csv/package.json
+++ b/samples/maps/geo-map/binding-data-csv/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/binding-data-csv/src/app/app.module.ts b/samples/maps/geo-map/binding-data-csv/src/app/app.module.ts
index b8a079e9f..9b61e92db 100644
--- a/samples/maps/geo-map/binding-data-csv/src/app/app.module.ts
+++ b/samples/maps/geo-map/binding-data-csv/src/app/app.module.ts
@@ -22,7 +22,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/binding-data-json-points/package.json b/samples/maps/geo-map/binding-data-json-points/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/binding-data-json-points/package.json
+++ b/samples/maps/geo-map/binding-data-json-points/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/binding-data-json-points/src/app/app.module.ts b/samples/maps/geo-map/binding-data-json-points/src/app/app.module.ts
index e5907879f..888fd1b03 100644
--- a/samples/maps/geo-map/binding-data-json-points/src/app/app.module.ts
+++ b/samples/maps/geo-map/binding-data-json-points/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/binding-data-model/package.json b/samples/maps/geo-map/binding-data-model/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/binding-data-model/package.json
+++ b/samples/maps/geo-map/binding-data-model/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/binding-data-model/src/app/app.module.ts b/samples/maps/geo-map/binding-data-model/src/app/app.module.ts
index e5907879f..888fd1b03 100644
--- a/samples/maps/geo-map/binding-data-model/src/app/app.module.ts
+++ b/samples/maps/geo-map/binding-data-model/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/binding-multiple-shapes/package.json b/samples/maps/geo-map/binding-multiple-shapes/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/binding-multiple-shapes/package.json
+++ b/samples/maps/geo-map/binding-multiple-shapes/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/binding-multiple-shapes/src/app/app.module.ts b/samples/maps/geo-map/binding-multiple-shapes/src/app/app.module.ts
index e5907879f..888fd1b03 100644
--- a/samples/maps/geo-map/binding-multiple-shapes/src/app/app.module.ts
+++ b/samples/maps/geo-map/binding-multiple-shapes/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/binding-multiple-sources/package.json b/samples/maps/geo-map/binding-multiple-sources/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/binding-multiple-sources/package.json
+++ b/samples/maps/geo-map/binding-multiple-sources/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/binding-multiple-sources/src/app/app.module.ts b/samples/maps/geo-map/binding-multiple-sources/src/app/app.module.ts
index e5907879f..888fd1b03 100644
--- a/samples/maps/geo-map/binding-multiple-sources/src/app/app.module.ts
+++ b/samples/maps/geo-map/binding-multiple-sources/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/binding-shp-points/package.json b/samples/maps/geo-map/binding-shp-points/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/binding-shp-points/package.json
+++ b/samples/maps/geo-map/binding-shp-points/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/binding-shp-points/src/app/app.module.ts b/samples/maps/geo-map/binding-shp-points/src/app/app.module.ts
index e5907879f..888fd1b03 100644
--- a/samples/maps/geo-map/binding-shp-points/src/app/app.module.ts
+++ b/samples/maps/geo-map/binding-shp-points/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/binding-shp-polygons/package.json b/samples/maps/geo-map/binding-shp-polygons/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/binding-shp-polygons/package.json
+++ b/samples/maps/geo-map/binding-shp-polygons/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/binding-shp-polygons/src/app/app.module.ts b/samples/maps/geo-map/binding-shp-polygons/src/app/app.module.ts
index e5907879f..888fd1b03 100644
--- a/samples/maps/geo-map/binding-shp-polygons/src/app/app.module.ts
+++ b/samples/maps/geo-map/binding-shp-polygons/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/binding-shp-polylines/package.json b/samples/maps/geo-map/binding-shp-polylines/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/binding-shp-polylines/package.json
+++ b/samples/maps/geo-map/binding-shp-polylines/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/binding-shp-polylines/src/app/app.module.ts b/samples/maps/geo-map/binding-shp-polylines/src/app/app.module.ts
index e5907879f..888fd1b03 100644
--- a/samples/maps/geo-map/binding-shp-polylines/src/app/app.module.ts
+++ b/samples/maps/geo-map/binding-shp-polylines/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/custom-tooltips/package.json b/samples/maps/geo-map/custom-tooltips/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/custom-tooltips/package.json
+++ b/samples/maps/geo-map/custom-tooltips/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/custom-tooltips/src/app/app.module.ts b/samples/maps/geo-map/custom-tooltips/src/app/app.module.ts
index e5907879f..888fd1b03 100644
--- a/samples/maps/geo-map/custom-tooltips/src/app/app.module.ts
+++ b/samples/maps/geo-map/custom-tooltips/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/display-bing-imagery/package.json b/samples/maps/geo-map/display-bing-imagery/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/display-bing-imagery/package.json
+++ b/samples/maps/geo-map/display-bing-imagery/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/display-bing-imagery/src/app/app.module.ts b/samples/maps/geo-map/display-bing-imagery/src/app/app.module.ts
index f0139450a..9180741ca 100644
--- a/samples/maps/geo-map/display-bing-imagery/src/app/app.module.ts
+++ b/samples/maps/geo-map/display-bing-imagery/src/app/app.module.ts
@@ -22,7 +22,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/display-esri-imagery/package.json b/samples/maps/geo-map/display-esri-imagery/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/display-esri-imagery/package.json
+++ b/samples/maps/geo-map/display-esri-imagery/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/display-esri-imagery/src/app/app.module.ts b/samples/maps/geo-map/display-esri-imagery/src/app/app.module.ts
index f0139450a..9180741ca 100644
--- a/samples/maps/geo-map/display-esri-imagery/src/app/app.module.ts
+++ b/samples/maps/geo-map/display-esri-imagery/src/app/app.module.ts
@@ -22,7 +22,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/display-heat-imagery/package.json b/samples/maps/geo-map/display-heat-imagery/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/display-heat-imagery/package.json
+++ b/samples/maps/geo-map/display-heat-imagery/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/display-heat-imagery/src/app/app.module.ts b/samples/maps/geo-map/display-heat-imagery/src/app/app.module.ts
index e5907879f..888fd1b03 100644
--- a/samples/maps/geo-map/display-heat-imagery/src/app/app.module.ts
+++ b/samples/maps/geo-map/display-heat-imagery/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/display-osm-imagery/package.json b/samples/maps/geo-map/display-osm-imagery/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/display-osm-imagery/package.json
+++ b/samples/maps/geo-map/display-osm-imagery/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/display-osm-imagery/src/app/app.module.ts b/samples/maps/geo-map/display-osm-imagery/src/app/app.module.ts
index f0139450a..9180741ca 100644
--- a/samples/maps/geo-map/display-osm-imagery/src/app/app.module.ts
+++ b/samples/maps/geo-map/display-osm-imagery/src/app/app.module.ts
@@ -22,7 +22,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/marker-layouts/package.json b/samples/maps/geo-map/marker-layouts/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/marker-layouts/package.json
+++ b/samples/maps/geo-map/marker-layouts/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/marker-layouts/src/app/app.module.ts b/samples/maps/geo-map/marker-layouts/src/app/app.module.ts
index e5907879f..888fd1b03 100644
--- a/samples/maps/geo-map/marker-layouts/src/app/app.module.ts
+++ b/samples/maps/geo-map/marker-layouts/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/marker-template/package.json b/samples/maps/geo-map/marker-template/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/marker-template/package.json
+++ b/samples/maps/geo-map/marker-template/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/marker-template/src/app/app.module.ts b/samples/maps/geo-map/marker-template/src/app/app.module.ts
index e5907879f..888fd1b03 100644
--- a/samples/maps/geo-map/marker-template/src/app/app.module.ts
+++ b/samples/maps/geo-map/marker-template/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/marker-type/package.json b/samples/maps/geo-map/marker-type/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/marker-type/package.json
+++ b/samples/maps/geo-map/marker-type/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/marker-type/src/app/app.module.ts b/samples/maps/geo-map/marker-type/src/app/app.module.ts
index e5907879f..888fd1b03 100644
--- a/samples/maps/geo-map/marker-type/src/app/app.module.ts
+++ b/samples/maps/geo-map/marker-type/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/navigation/package.json b/samples/maps/geo-map/navigation/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/navigation/package.json
+++ b/samples/maps/geo-map/navigation/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/navigation/src/app/app.module.ts b/samples/maps/geo-map/navigation/src/app/app.module.ts
index e5907879f..888fd1b03 100644
--- a/samples/maps/geo-map/navigation/src/app/app.module.ts
+++ b/samples/maps/geo-map/navigation/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/overview/package.json b/samples/maps/geo-map/overview/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/overview/package.json
+++ b/samples/maps/geo-map/overview/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/overview/src/app/app.module.ts b/samples/maps/geo-map/overview/src/app/app.module.ts
index e5907879f..888fd1b03 100644
--- a/samples/maps/geo-map/overview/src/app/app.module.ts
+++ b/samples/maps/geo-map/overview/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/shape-styling/package.json b/samples/maps/geo-map/shape-styling/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/shape-styling/package.json
+++ b/samples/maps/geo-map/shape-styling/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/shape-styling/src/app/app.module.ts b/samples/maps/geo-map/shape-styling/src/app/app.module.ts
index e5907879f..888fd1b03 100644
--- a/samples/maps/geo-map/shape-styling/src/app/app.module.ts
+++ b/samples/maps/geo-map/shape-styling/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/triangulating-data/package.json b/samples/maps/geo-map/triangulating-data/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/triangulating-data/package.json
+++ b/samples/maps/geo-map/triangulating-data/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/triangulating-data/src/app/app.module.ts b/samples/maps/geo-map/triangulating-data/src/app/app.module.ts
index e5907879f..888fd1b03 100644
--- a/samples/maps/geo-map/triangulating-data/src/app/app.module.ts
+++ b/samples/maps/geo-map/triangulating-data/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/type-scatter-area-series/package.json b/samples/maps/geo-map/type-scatter-area-series/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/type-scatter-area-series/package.json
+++ b/samples/maps/geo-map/type-scatter-area-series/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/type-scatter-area-series/src/app/app.module.ts b/samples/maps/geo-map/type-scatter-area-series/src/app/app.module.ts
index e5907879f..888fd1b03 100644
--- a/samples/maps/geo-map/type-scatter-area-series/src/app/app.module.ts
+++ b/samples/maps/geo-map/type-scatter-area-series/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/type-scatter-bubble-series/package.json b/samples/maps/geo-map/type-scatter-bubble-series/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/type-scatter-bubble-series/package.json
+++ b/samples/maps/geo-map/type-scatter-bubble-series/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/type-scatter-bubble-series/src/app/app.module.ts b/samples/maps/geo-map/type-scatter-bubble-series/src/app/app.module.ts
index e5907879f..888fd1b03 100644
--- a/samples/maps/geo-map/type-scatter-bubble-series/src/app/app.module.ts
+++ b/samples/maps/geo-map/type-scatter-bubble-series/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/type-scatter-contour-series/package.json b/samples/maps/geo-map/type-scatter-contour-series/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/type-scatter-contour-series/package.json
+++ b/samples/maps/geo-map/type-scatter-contour-series/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/type-scatter-contour-series/src/app/app.module.ts b/samples/maps/geo-map/type-scatter-contour-series/src/app/app.module.ts
index e5907879f..888fd1b03 100644
--- a/samples/maps/geo-map/type-scatter-contour-series/src/app/app.module.ts
+++ b/samples/maps/geo-map/type-scatter-contour-series/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/type-scatter-density-series/package.json b/samples/maps/geo-map/type-scatter-density-series/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/type-scatter-density-series/package.json
+++ b/samples/maps/geo-map/type-scatter-density-series/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/type-scatter-density-series/src/app/app.module.ts b/samples/maps/geo-map/type-scatter-density-series/src/app/app.module.ts
index e5907879f..888fd1b03 100644
--- a/samples/maps/geo-map/type-scatter-density-series/src/app/app.module.ts
+++ b/samples/maps/geo-map/type-scatter-density-series/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/type-scatter-symbol-series/package.json b/samples/maps/geo-map/type-scatter-symbol-series/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/type-scatter-symbol-series/package.json
+++ b/samples/maps/geo-map/type-scatter-symbol-series/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/type-scatter-symbol-series/src/app/app.module.ts b/samples/maps/geo-map/type-scatter-symbol-series/src/app/app.module.ts
index e5907879f..888fd1b03 100644
--- a/samples/maps/geo-map/type-scatter-symbol-series/src/app/app.module.ts
+++ b/samples/maps/geo-map/type-scatter-symbol-series/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/type-shape-polygon-series/package.json b/samples/maps/geo-map/type-shape-polygon-series/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/type-shape-polygon-series/package.json
+++ b/samples/maps/geo-map/type-shape-polygon-series/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/type-shape-polygon-series/src/app/app.module.ts b/samples/maps/geo-map/type-shape-polygon-series/src/app/app.module.ts
index e5907879f..888fd1b03 100644
--- a/samples/maps/geo-map/type-shape-polygon-series/src/app/app.module.ts
+++ b/samples/maps/geo-map/type-shape-polygon-series/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}
diff --git a/samples/maps/geo-map/type-shape-polyline-series/package.json b/samples/maps/geo-map/type-shape-polyline-series/package.json
index 0006421e8..6d887b173 100644
--- a/samples/maps/geo-map/type-shape-polyline-series/package.json
+++ b/samples/maps/geo-map/type-shape-polyline-series/package.json
@@ -18,9 +18,9 @@
     "classlist.js": "1.1.20150312",
     "core-js": "2.6.2",
     "hammerjs": "2.0.8",
-    "igniteui-angular-charts": "16.1.0",
-    "igniteui-angular-core": "16.1.0",
-    "igniteui-angular-maps": "16.1.0",
+    "@infragistics/igniteui-angular-charts": "23.2.18",
+    "@infragistics/igniteui-angular-core": "23.2.18",
+    "@infragistics/igniteui-angular-maps": "23.2.18",
     "intl": "1.2.5",
     "jszip": "3.7.1",
     "rxjs": "6.6.7",
diff --git a/samples/maps/geo-map/type-shape-polyline-series/src/app/app.module.ts b/samples/maps/geo-map/type-shape-polyline-series/src/app/app.module.ts
index e5907879f..888fd1b03 100644
--- a/samples/maps/geo-map/type-shape-polyline-series/src/app/app.module.ts
+++ b/samples/maps/geo-map/type-shape-polyline-series/src/app/app.module.ts
@@ -24,7 +24,6 @@ import { IgxDataChartInteractivityModule } from "igniteui-angular-charts";
     IgxDataChartInteractivityModule
 ],
   providers: [],
-  entryComponents: [],
   schemas: []
 })
 export class AppModule {}

From a7111a505cd7662ae7c6d8bbcb2cc860c59054da Mon Sep 17 00:00:00 2001
From: HUSSAR-mtrela <HUSSAR-mtrela@users.noreply.github.com>
Date: Wed, 20 Sep 2023 13:22:44 -0400
Subject: [PATCH 2/2] fixed package and gulp script

---
 browser/package.json       |  1 -
 browser/scripts/browser.js | 59 ++++++++++++++++----------------------
 2 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/browser/package.json b/browser/package.json
index 7be27cde3..656f70fec 100644
--- a/browser/package.json
+++ b/browser/package.json
@@ -41,7 +41,6 @@
     "immediate": "3.2.3",
     "igniteui-angular": "16.0.7",
     "igniteui-theming": "1.4.14",
-    "igniteui-angular-charts": "16.1.0",
     "@infragistics/igniteui-angular-core": "23.2.18",
     "@infragistics/igniteui-angular-charts": "23.2.18",
     "@infragistics/igniteui-angular-excel": "23.2.18",
diff --git a/browser/scripts/browser.js b/browser/scripts/browser.js
index 9525a3f4c..2800eac3d 100644
--- a/browser/scripts/browser.js
+++ b/browser/scripts/browser.js
@@ -1016,22 +1016,27 @@ function updateSamples(cb) {
 
 function updateIG(cb) {
 
-    // NOTE: change this array with new version of packages and optionally use "@infragistics/" proget prefix, e.g.
-    // "igniteui-angular-charts" instead of "igniteui-angular-charts" e.g.
-    // { name: "igniteui-angular-charts", version: "14.2.0" }, // proget
-    // { name:               "igniteui-angular-charts", version: "14.1.0" },  // npm
+    // cleanup packages to speedup this gulp script
+    // del.sync("./samples/**/node_modules/**/*.*", {force:true});
+    // del.sync("./samples/**/node_modules/**", {force:true});
+    // del.sync("./samples/**/node_modules", {force:true});
+
+    // NOTE: change this array with new version of packages 
+    // and optionally use "@infragistics/" proget prefix, e.g.
+    // { name: "@infragistics/igniteui-angular-charts", version: "23.2.18" }, // PROGET
+    // { name:               "igniteui-angular-charts", version: "14.1.0" },  // NPM
     let packageUpgrades = [
         // these IG packages are often updated:
-        { name: "igniteui-angular-core"                     , version: "23.2.18" },
-        { name: "igniteui-angular-charts"                   , version: "23.2.18" },
-        { name: "igniteui-angular-excel"                    , version: "23.2.18" },
-        { name: "igniteui-angular-gauges"                   , version: "23.2.18" },
-        { name: "igniteui-angular-inputs"                   , version: "23.2.18" },
-        { name: "igniteui-angular-layouts"                  , version: "23.2.18" },
-        { name: "igniteui-angular-maps"                     , version: "23.2.18" },
-        { name: "igniteui-angular-spreadsheet-chart-adapter", version: "23.2.18" },
-        { name: "igniteui-angular-spreadsheet"              , version: "23.2.18" },
-        { name: "igniteui-angular-datasources"              , version: "23.2.18" },
+        { name: "@infragistics/igniteui-angular-core"                     , version: "23.2.18" },
+        { name: "@infragistics/igniteui-angular-charts"                   , version: "23.2.18" },
+        { name: "@infragistics/igniteui-angular-excel"                    , version: "23.2.18" },
+        { name: "@infragistics/igniteui-angular-gauges"                   , version: "23.2.18" },
+        { name: "@infragistics/igniteui-angular-inputs"                   , version: "23.2.18" },
+        { name: "@infragistics/igniteui-angular-layouts"                  , version: "23.2.18" },
+        { name: "@infragistics/igniteui-angular-maps"                     , version: "23.2.18" },
+        { name: "@infragistics/igniteui-angular-spreadsheet-chart-adapter", version: "23.2.18" },
+        { name: "@infragistics/igniteui-angular-spreadsheet"              , version: "23.2.18" },
+        { name: "@infragistics/igniteui-angular-datasources"              , version: "23.2.18" },
         // these IG packages are sometimes updated:
         { name: "igniteui-webcomponents",            version: "4.3.0-beta.0" },
         { name: "igniteui-theming",                  version: "1.4.14" },
@@ -1055,22 +1060,11 @@ function updateIG(cb) {
     // NOTE you can comment out strings in this array to run these function only on a subset of samples
     var packagePaths = [
         './package.json', // browser
-        // '../samples/gauges/bullet-graph/animation/package.json',
-        '../samples/**/package.json',
+        // '../samples/**/package.json',
         // '../samples/charts/**/package.json',
-        // '../samples/editors/**/package.json',
-        // '../samples/excel/**/package.json',
-        // '../samples/gauges/**/package.json',
-        // '../samples/grids/**/package.json',
-        // '../samples/inputs/**/package.json',
-        // '../samples/layouts/**/package.json',
-        // '../samples/maps/**/package.json',
-        // '../samples/menus/**/package.json',
-        // '../samples/notifications/**/package.json',
-        // '../samples/scheduling/**/package.json',
-
-        // '../samples/charts/category-chart/**/package.json',
-        // '../samples/maps/geo-map/type-scatter-bubble-series/package.json',
+        '../samples/gauges/**/package.json',
+
+        // skip packages in node_modules folders
         '!../samples/**/node_modules/**/package.json',
         '!../samples/**/node_modules/**',
         '!../samples/**/node_modules',
@@ -1080,12 +1074,9 @@ function updateIG(cb) {
     let packageMappings = {};
     for (const item of packageUpgrades) {
         item.id = item.name.replace("@infragistics/", "");
-        let name = item.name.replace("@infragistics/", "");
-        packageMappings[name] = item;
+        packageMappings[item.id] = item;
     }
 
-    // console.log(packageMappings);
-
     let updatedPackages = 0;
     // gulp all package.json files in samples/browser
     gulp.src(packagePaths, {allowEmpty: true})
@@ -1129,7 +1120,7 @@ function updateIG(cb) {
         fileCallback(null, file);
     }))
     .on("end", function() {
-        log("updateIG... done = " + updatedPackages + " files");
+        log("updated: " + updatedPackages + " package files");
         cb();
     });