diff --git a/openecomp-ui/src/sdc-app/features/featureToggle.js b/openecomp-ui/src/sdc-app/features/featureToggle.js
index d33c76e..861db6a 100644
--- a/openecomp-ui/src/sdc-app/features/featureToggle.js
+++ b/openecomp-ui/src/sdc-app/features/featureToggle.js
@@ -38,12 +38,14 @@
 
 export const FeatureComponent = props => {
     const { features = [], featureName, InnerComponent, ...otherProps } = props;
-    const AComp = InnerComponent.AComp ? InnerComponent.AComp : InnerComponent;
+    const OnComp = InnerComponent.OnComp
+        ? InnerComponent.OnComp
+        : InnerComponent;
 
     return !!features.find(el => el.name === featureName && el.active) ? (
-        <AComp {...otherProps} />
-    ) : InnerComponent.BComp ? (
-        <InnerComponent.BComp {...otherProps} />
+        <OnComp {...otherProps} />
+    ) : InnerComponent.OffComp ? (
+        <InnerComponent.OffComp {...otherProps} />
     ) : null;
 };