diff --git a/public/apps/configuration/header/test/header-components.test.tsx b/public/apps/configuration/header/test/header-components.test.tsx
index 24b41f15..e9a677f5 100644
--- a/public/apps/configuration/header/test/header-components.test.tsx
+++ b/public/apps/configuration/header/test/header-components.test.tsx
@@ -53,7 +53,7 @@ describe('PageHeader', () => {
       subAction: 'test-sub-action',
       count: 5,
       descriptionControls: ['control-1'],
-      controlControls: ['control-2'],
+      appRightControls: ['control-2'],
       fallBackComponent: <div>Fallback Component</div>,
     };
   });
diff --git a/public/apps/configuration/panels/permission-list/test/__snapshots__/permission-list.test.tsx.snap b/public/apps/configuration/panels/permission-list/test/__snapshots__/permission-list.test.tsx.snap
index 04c70f89..2dc58bac 100644
--- a/public/apps/configuration/panels/permission-list/test/__snapshots__/permission-list.test.tsx.snap
+++ b/public/apps/configuration/panels/permission-list/test/__snapshots__/permission-list.test.tsx.snap
@@ -63,7 +63,7 @@ exports[`Permission list page  AccessError component should load access error co
     setDataSource={[MockFunction]}
   />
   <PageHeader
-    controlControls={
+    appRightControls={
       Array [
         Object {
           "isLoading": false,
diff --git a/public/apps/configuration/panels/role-view/test/__snapshots__/role-view.test.tsx.snap b/public/apps/configuration/panels/role-view/test/__snapshots__/role-view.test.tsx.snap
index dd05b6aa..2f557ebd 100644
--- a/public/apps/configuration/panels/role-view/test/__snapshots__/role-view.test.tsx.snap
+++ b/public/apps/configuration/panels/role-view/test/__snapshots__/role-view.test.tsx.snap
@@ -43,7 +43,7 @@ exports[`Role view basic rendering when permission tab is selected 1`] = `
     setDataSource={[MockFunction]}
   />
   <PageHeader
-    controlControls={
+    appRightControls={
       Array [
         Object {
           "ariaLabel": "delete",
@@ -476,7 +476,7 @@ exports[`Role view renders when mapped user tab is selected 1`] = `
     setDataSource={[MockFunction]}
   />
   <PageHeader
-    controlControls={
+    appRightControls={
       Array [
         Object {
           "ariaLabel": "delete",
diff --git a/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap b/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap
index b43cc332..33a5d800 100644
--- a/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap
+++ b/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap
@@ -32,7 +32,7 @@ exports[`Get started (landing page) renders when backend configuration is disabl
       setDataSource={[MockFunction]}
     />
     <PageHeader
-      controlControls={
+      appRightControls={
         Array [
           Object {
             "href": "#/",
@@ -334,7 +334,7 @@ exports[`Get started (landing page) renders when backend configuration is enable
       setDataSource={[MockFunction]}
     />
     <PageHeader
-      controlControls={
+      appRightControls={
         Array [
           Object {
             "href": "#/",
diff --git a/public/apps/configuration/panels/test/__snapshots__/role-list.test.tsx.snap b/public/apps/configuration/panels/test/__snapshots__/role-list.test.tsx.snap
index f55060ec..cdc9a6f1 100644
--- a/public/apps/configuration/panels/test/__snapshots__/role-list.test.tsx.snap
+++ b/public/apps/configuration/panels/test/__snapshots__/role-list.test.tsx.snap
@@ -39,7 +39,7 @@ exports[`Role list AccessError component should load access error component 1`]
     setDataSource={[MockFunction]}
   />
   <PageHeader
-    controlControls={
+    appRightControls={
       Array [
         Object {
           "fill": true,
diff --git a/public/apps/configuration/panels/test/__snapshots__/user-list.test.tsx.snap b/public/apps/configuration/panels/test/__snapshots__/user-list.test.tsx.snap
index f069a919..105e6dd3 100644
--- a/public/apps/configuration/panels/test/__snapshots__/user-list.test.tsx.snap
+++ b/public/apps/configuration/panels/test/__snapshots__/user-list.test.tsx.snap
@@ -43,7 +43,7 @@ exports[`User list AccessError component should load access error component 1`]
     setDataSource={[MockFunction]}
   />
   <PageHeader
-    controlControls={
+    appRightControls={
       Array [
         Object {
           "fill": true,