diff --git a/packages/scandipwa/src/component/CheckoutDeliveryOptions/CheckoutDeliveryOptions.component.tsx b/packages/scandipwa/src/component/CheckoutDeliveryOptions/CheckoutDeliveryOptions.component.tsx
index e7ea73957c..423091ef57 100644
--- a/packages/scandipwa/src/component/CheckoutDeliveryOptions/CheckoutDeliveryOptions.component.tsx
+++ b/packages/scandipwa/src/component/CheckoutDeliveryOptions/CheckoutDeliveryOptions.component.tsx
@@ -82,4 +82,4 @@ export class CheckoutDeliveryOptionsComponent extends PureComponent<CheckoutDeli
     }
 }
 
-export default CheckoutDeliveryOptionsComponentProps;
+export default CheckoutDeliveryOptionsComponent;
diff --git a/packages/scandipwa/src/component/CheckoutDeliveryOptions/CheckoutDeliveryOptions.container.tsx b/packages/scandipwa/src/component/CheckoutDeliveryOptions/CheckoutDeliveryOptions.container.tsx
index 45302eceee..40ee4d1d6f 100644
--- a/packages/scandipwa/src/component/CheckoutDeliveryOptions/CheckoutDeliveryOptions.container.tsx
+++ b/packages/scandipwa/src/component/CheckoutDeliveryOptions/CheckoutDeliveryOptions.container.tsx
@@ -16,7 +16,7 @@ import { ReactElement } from 'Type/Common.type';
 
 import CheckoutDeliveryOptions from './CheckoutDeliveryOptions.component';
 import {
-    CheckoutDeliveryOptionsComponent,
+    CheckoutDeliveryOptionsComponentProps,
     CheckoutDeliveryOptionsContainerProps,
     CheckoutDeliveryOptionsContainerPropsKeys,
     CheckoutDeliveryOptionsContainerState,
@@ -37,7 +37,7 @@ CheckoutDeliveryOptionsContainerState
 
     dataMap = {};
 
-    containerProps(): Pick<CheckoutDeliveryOptionsComponent, CheckoutDeliveryOptionsContainerPropsKeys> {
+    containerProps(): Pick<CheckoutDeliveryOptionsComponentProps, CheckoutDeliveryOptionsContainerPropsKeys> {
         const {
             shippingMethods,
             handleSelectDeliveryMethod,
diff --git a/packages/scandipwa/src/component/CheckoutPayments/CheckoutPayments.component.tsx b/packages/scandipwa/src/component/CheckoutPayments/CheckoutPayments.component.tsx
index 45c5a871df..195f1d1f3e 100644
--- a/packages/scandipwa/src/component/CheckoutPayments/CheckoutPayments.component.tsx
+++ b/packages/scandipwa/src/component/CheckoutPayments/CheckoutPayments.component.tsx
@@ -14,7 +14,7 @@ import { ErrorInfo, PureComponent } from 'react';
 
 import CheckoutPayment from 'Component/CheckoutPayment';
 import NotSupportedPayment from 'Component/NotSupportedPayment';
-import { PurchaseOrder } from 'Component/PurchaseOrder/PurchaseOrder.component';
+import { PurchaseOrderComponent } from 'Component/PurchaseOrder/PurchaseOrder.component';
 import { PaymentMethod } from 'Query/Checkout.type';
 import { CheckoutSteps } from 'Route/Checkout/Checkout.config';
 import { ReactElement } from 'Type/Common.type';
@@ -63,7 +63,7 @@ export class CheckoutPaymentsComponent extends PureComponent<CheckoutPaymentsCom
     // }
 
     renderPurchaseOrderPayment(): ReactElement {
-        return <PurchaseOrder id={ CheckoutSteps.BILLING_STEP } />;
+        return <PurchaseOrderComponent id={ CheckoutSteps.BILLING_STEP } />;
     }
 
     renderNotSupported(): ReactElement {
diff --git a/packages/scandipwa/src/component/NavigationAbstract/NavigationAbstract.component.tsx b/packages/scandipwa/src/component/NavigationAbstract/NavigationAbstract.component.tsx
index 0b25ef730e..bf6acb849d 100644
--- a/packages/scandipwa/src/component/NavigationAbstract/NavigationAbstract.component.tsx
+++ b/packages/scandipwa/src/component/NavigationAbstract/NavigationAbstract.component.tsx
@@ -28,6 +28,7 @@ Props
         [DEFAULT_STATE_NAME]: {},
     };
 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     renderMap: Record<string, (isVisible?: boolean, key?: string) => ReactElement> = {};
 
     renderNavigationState(): ReactElement {
diff --git a/packages/scandipwa/src/component/ProductActions/ProductActions.component.tsx b/packages/scandipwa/src/component/ProductActions/ProductActions.component.tsx
index af238de249..7416ee35a1 100644
--- a/packages/scandipwa/src/component/ProductActions/ProductActions.component.tsx
+++ b/packages/scandipwa/src/component/ProductActions/ProductActions.component.tsx
@@ -10,7 +10,7 @@
  */
 
 import Html from 'Component/Html';
-import { Product } from 'Component/Product/Product.component';
+import { ProductComponent } from 'Component/Product/Product.component';
 import { ProductType } from 'Component/Product/Product.config';
 import ProductAlerts from 'Component/ProductAlerts';
 import TextPlaceholder from 'Component/TextPlaceholder';
@@ -32,9 +32,9 @@ import './ProductActions.style';
  * @class ProductActions
  * @namespace Component/ProductActions/Component
  */
-export class ProductActionsComponent extends Product<ProductActionsComponentProps> {
+export class ProductActionsComponent extends ProductComponent<ProductActionsComponentProps> {
     static defaultProps: Partial<ProductActionsComponentProps> = {
-        ...Product.defaultProps,
+        ...ProductComponent.defaultProps,
         productName: '',
         isPricePreview: false,
     };
diff --git a/packages/scandipwa/src/component/ProductCard/ProductCard.component.tsx b/packages/scandipwa/src/component/ProductCard/ProductCard.component.tsx
index a297029516..9c9dfc0c4d 100644
--- a/packages/scandipwa/src/component/ProductCard/ProductCard.component.tsx
+++ b/packages/scandipwa/src/component/ProductCard/ProductCard.component.tsx
@@ -16,7 +16,7 @@ import Image from 'Component/Image';
 import { ImageRatio } from 'Component/Image/Image.type';
 import Link from 'Component/Link';
 import Loader from 'Component/Loader';
-import { Product } from 'Component/Product/Product.component';
+import { ProductComponent } from 'Component/Product/Product.component';
 import { ProductType } from 'Component/Product/Product.config';
 import TextPlaceholder from 'Component/TextPlaceholder';
 import { TextPlaceHolderLength } from 'Component/TextPlaceholder/TextPlaceholder.config';
@@ -34,9 +34,9 @@ import './ProductCard.style';
  * Product card
  * @class ProductCard
  * @namespace Component/ProductCard/Component */
-export class ProductCardComponent extends Product<ProductCardComponentProps> {
+export class ProductCardComponent extends ProductComponent<ProductCardComponentProps> {
     static defaultProps: Partial<ProductCardComponentProps> = {
-        ...Product.defaultProps,
+        ...ProductComponent.defaultProps,
         thumbnail: '',
         linkTo: '',
         children: null,
diff --git a/packages/scandipwa/src/component/ProductCompareButton/ProductCompareButton.component.tsx b/packages/scandipwa/src/component/ProductCompareButton/ProductCompareButton.component.tsx
index f53661c2f4..d3a55f6da5 100644
--- a/packages/scandipwa/src/component/ProductCompareButton/ProductCompareButton.component.tsx
+++ b/packages/scandipwa/src/component/ProductCompareButton/ProductCompareButton.component.tsx
@@ -27,6 +27,7 @@ export class ProductCompareButtonComponent extends PureComponent<ProductCompareB
         isActive: false,
     };
 
+    /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
     handleClick: ((e: MouseEvent) => void) | (() => void) = noopFn;
 
     __construct(props: ProductCompareButtonComponentProps): void {
diff --git a/packages/scandipwa/src/component/VideoThumbnail/VideoThumbnail.component.tsx b/packages/scandipwa/src/component/VideoThumbnail/VideoThumbnail.component.tsx
index e321f0737b..00b04ba3c2 100644
--- a/packages/scandipwa/src/component/VideoThumbnail/VideoThumbnail.component.tsx
+++ b/packages/scandipwa/src/component/VideoThumbnail/VideoThumbnail.component.tsx
@@ -72,4 +72,4 @@ export class VideoThumbnailComponent extends PureComponent<VideoThumbnailCompone
     }
 }
 
-export default VideoThumbnailComponentProps;
+export default VideoThumbnailComponent;
diff --git a/packages/scandipwa/src/route/CreateAccount/CreateAccount.component.tsx b/packages/scandipwa/src/route/CreateAccount/CreateAccount.component.tsx
index 86a3a13c6e..6e1ec54f94 100644
--- a/packages/scandipwa/src/route/CreateAccount/CreateAccount.component.tsx
+++ b/packages/scandipwa/src/route/CreateAccount/CreateAccount.component.tsx
@@ -12,7 +12,7 @@
 import ContentWrapper from 'Component/ContentWrapper';
 import Loader from 'Component/Loader';
 import {
-    MyAccountOverlay,
+    MyAccountOverlayComponent,
 } from 'Component/MyAccountOverlay/MyAccountOverlay.component';
 import { ReactElement } from 'Type/Common.type';
 
@@ -21,7 +21,7 @@ import { CreateAccountComponentProps } from './CreateAccount.type';
 import './CreateAccount.style';
 
 /** @namespace Route/CreateAccount/Component */
-export class CreateAccountComponent extends MyAccountOverlay<CreateAccountComponentProps> {
+export class CreateAccountComponent extends MyAccountOverlayComponent<CreateAccountComponentProps> {
     renderSignInWrapper(): ReactElement {
         const { onLoginClick } = this.props;
 
diff --git a/packages/scandipwa/src/route/ForgotPassword/ForgotPassword.component.tsx b/packages/scandipwa/src/route/ForgotPassword/ForgotPassword.component.tsx
index e27e514e96..83bbbe36db 100644
--- a/packages/scandipwa/src/route/ForgotPassword/ForgotPassword.component.tsx
+++ b/packages/scandipwa/src/route/ForgotPassword/ForgotPassword.component.tsx
@@ -14,7 +14,7 @@ import { Redirect } from 'react-router';
 import ContentWrapper from 'Component/ContentWrapper';
 import Loader from 'Component/Loader';
 import {
-    MyAccountOverlay,
+    MyAccountOverlayComponent,
 } from 'Component/MyAccountOverlay/MyAccountOverlay.component';
 import { AccountPageUrl } from 'Route/MyAccount/MyAccount.config';
 import { ReactElement } from 'Type/Common.type';
@@ -25,7 +25,7 @@ import { ForgotPasswordComponentProps } from './ForgotPassword.type';
 import './ForgotPassword.style';
 
 /** @namespace Route/ForgotPassword/Component */
-export class ForgotPasswordComponent extends MyAccountOverlay<ForgotPasswordComponentProps> {
+export class ForgotPasswordComponent extends MyAccountOverlayComponent<ForgotPasswordComponentProps> {
     renderSignInWrapper(): ReactElement {
         const { onLoginClick } = this.props;
 
diff --git a/packages/scandipwa/src/route/LoginAccount/LoginAccount.component.tsx b/packages/scandipwa/src/route/LoginAccount/LoginAccount.component.tsx
index 1026aa42fd..33ec5a9b3f 100644
--- a/packages/scandipwa/src/route/LoginAccount/LoginAccount.component.tsx
+++ b/packages/scandipwa/src/route/LoginAccount/LoginAccount.component.tsx
@@ -14,7 +14,7 @@ import { withRouter } from 'react-router-dom';
 import ContentWrapper from 'Component/ContentWrapper';
 import Loader from 'Component/Loader';
 import {
-    MyAccountOverlay,
+    MyAccountOverlayComponent,
 } from 'Component/MyAccountOverlay/MyAccountOverlay.component';
 import { ReactElement } from 'Type/Common.type';
 
@@ -23,7 +23,7 @@ import { LoginAccountComponentProps } from './LoginAccount.type';
 import './LoginAccount.style';
 
 /** @namespace Route/LoginAccount/Component */
-export class LoginAccountComponent extends MyAccountOverlay<LoginAccountComponentProps> {
+export class LoginAccountComponent extends MyAccountOverlayComponent<LoginAccountComponentProps> {
     renderSignInWrapper(): ReactElement {
         const { isMobile } = this.props;