diff --git a/src/Recoils/HyperswitchAtom.res b/src/Recoils/HyperswitchAtom.res
index 3be101b74..8602befa8 100644
--- a/src/Recoils/HyperswitchAtom.res
+++ b/src/Recoils/HyperswitchAtom.res
@@ -26,12 +26,12 @@ let paypalAccountStatusAtom: Recoil.recoilAtom<PayPalFlowTypes.setupAccountStatu
 // TODO: remove this after userGroupPermissionsAtom is stable
 let userPermissionAtom: Recoil.recoilAtom<UserManagementTypes.permissionJson> = Recoil.atom(
   "userPermissionAtom",
-  PermissionMapper.defaultValueForPermission,
+  GroupACLMapper.defaultValueForPermission,
 )
 
-let userGroupPermissionsAtom: Recoil.recoilAtom<
+let userGroupACLAtom: Recoil.recoilAtom<
   option<Map.t<UserManagementTypes.permissionType, CommonAuthTypes.authorization>>,
-> = Recoil.atom("userGroupPermissionsAtom", None)
+> = Recoil.atom("userGroupACLAtom", None)
 
 let switchMerchantListAtom: Recoil.recoilAtom<
   array<SwitchMerchantUtils.switchMerchantListResponse>,
diff --git a/src/container/AnalyticsContainer.res b/src/container/AnalyticsContainer.res
index a77c8c5ee..3dc8a00ea 100644
--- a/src/container/AnalyticsContainer.res
+++ b/src/container/AnalyticsContainer.res
@@ -3,33 +3,33 @@ let make = () => {
   open HSwitchUtils
   open HyperswitchAtom
   let url = RescriptReactRouter.useUrl()
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let {userInfo: {analyticsEntity}} = React.useContext(UserInfoProvider.defaultContext)
   let {performanceMonitor, disputeAnalytics} = featureFlagAtom->Recoil.useRecoilValueFromAtom
   <div key={(analyticsEntity :> string)}>
     {switch url.path->urlPath {
     | list{"analytics-payments"} =>
-      <AccessControl permission={userHasAccess(~permission=AnalyticsView)}>
+      <AccessControl permission={userHasAccess(~groupACL=AnalyticsView)}>
         <FilterContext key="PaymentsAnalytics" index="PaymentsAnalytics">
           <PaymentAnalytics />
         </FilterContext>
       </AccessControl>
     | list{"analytics-refunds"} =>
-      <AccessControl permission={userHasAccess(~permission=AnalyticsView)}>
+      <AccessControl permission={userHasAccess(~groupACL=AnalyticsView)}>
         <FilterContext key="PaymentsRefunds" index="PaymentsRefunds">
           <RefundsAnalytics />
         </FilterContext>
       </AccessControl>
     | list{"analytics-disputes"} =>
       <AccessControl
-        isEnabled={disputeAnalytics} permission={userHasAccess(~permission=AnalyticsView)}>
+        isEnabled={disputeAnalytics} permission={userHasAccess(~groupACL=AnalyticsView)}>
         <FilterContext key="DisputeAnalytics" index="DisputeAnalytics">
           <DisputeAnalytics />
         </FilterContext>
       </AccessControl>
     | list{"performance-monitor"} =>
       <AccessControl
-        permission={userHasAccess(~permission=AnalyticsView)} isEnabled={performanceMonitor}>
+        permission={userHasAccess(~groupACL=AnalyticsView)} isEnabled={performanceMonitor}>
         <FilterContext key="PerformanceMonitor" index="PerformanceMonitor">
           <PerformanceMonitor domain="payments" />
         </FilterContext>
diff --git a/src/container/ConnectorContainer.res b/src/container/ConnectorContainer.res
index 55af136c7..e1a0f2ab1 100644
--- a/src/container/ConnectorContainer.res
+++ b/src/container/ConnectorContainer.res
@@ -6,7 +6,7 @@ let make = () => {
   open HSwitchUtils
   open HyperswitchAtom
   let url = RescriptReactRouter.useUrl()
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let featureFlagDetails = featureFlagAtom->Recoil.useRecoilValueFromAtom
   let fetchConnectorListResponse = ConnectorListHook.useFetchConnectorList()
   let fetchBusinessProfiles = BusinessProfileHook.useFetchBusinessProfiles()
@@ -15,9 +15,9 @@ let make = () => {
     try {
       setScreenState(_ => PageLoaderWrapper.Loading)
       if (
-        userHasAccess(~permission=ConnectorsView) === Access ||
-        userHasAccess(~permission=WorkflowsView) === Access ||
-        userHasAccess(~permission=WorkflowsManage) === Access
+        userHasAccess(~groupACL=ConnectorsView) === Access ||
+        userHasAccess(~groupACL=WorkflowsView) === Access ||
+        userHasAccess(~groupACL=WorkflowsManage) === Access
       ) {
         let _ = await fetchConnectorListResponse()
         let _ = await fetchBusinessProfiles()
@@ -37,7 +37,7 @@ let make = () => {
     {switch url.path->urlPath {
     // Connector Modules
     | list{"connectors", ...remainingPath} =>
-      <AccessControl permission={userHasAccess(~permission=ConnectorsView)}>
+      <AccessControl permission={userHasAccess(~groupACL=ConnectorsView)}>
         <EntityScaffold
           entityName="Connectors"
           remainingPath
@@ -48,8 +48,7 @@ let make = () => {
       </AccessControl>
     | list{"payoutconnectors", ...remainingPath} =>
       <AccessControl
-        isEnabled={featureFlagDetails.payOut}
-        permission={userHasAccess(~permission=ConnectorsView)}>
+        isEnabled={featureFlagDetails.payOut} permission={userHasAccess(~groupACL=ConnectorsView)}>
         <EntityScaffold
           entityName="PayoutConnectors"
           remainingPath
@@ -60,7 +59,7 @@ let make = () => {
       </AccessControl>
     | list{"3ds-authenticators", ...remainingPath} =>
       <AccessControl
-        permission={userHasAccess(~permission=ConnectorsView)}
+        permission={userHasAccess(~groupACL=ConnectorsView)}
         isEnabled={featureFlagDetails.threedsAuthenticator}>
         <EntityScaffold
           entityName="3DS Authenticator"
@@ -73,7 +72,7 @@ let make = () => {
 
     | list{"pm-authentication-processor", ...remainingPath} =>
       <AccessControl
-        permission={userHasAccess(~permission=ConnectorsView)}
+        permission={userHasAccess(~groupACL=ConnectorsView)}
         isEnabled={featureFlagDetails.pmAuthenticationProcessor}>
         <EntityScaffold
           entityName="PM Authentication Processor"
@@ -85,7 +84,7 @@ let make = () => {
       </AccessControl>
     | list{"tax-processor", ...remainingPath} =>
       <AccessControl
-        permission={userHasAccess(~permission=ConnectorsView)}
+        permission={userHasAccess(~groupACL=ConnectorsView)}
         isEnabled={featureFlagDetails.taxProcessor}>
         <EntityScaffold
           entityName="Tax Processor"
@@ -97,7 +96,7 @@ let make = () => {
       </AccessControl>
     | list{"fraud-risk-management", ...remainingPath} =>
       <AccessControl
-        isEnabled={featureFlagDetails.frm} permission={userHasAccess(~permission=ConnectorsView)}>
+        isEnabled={featureFlagDetails.frm} permission={userHasAccess(~groupACL=ConnectorsView)}>
         <EntityScaffold
           entityName="risk-management"
           remainingPath
@@ -108,7 +107,7 @@ let make = () => {
       </AccessControl>
     | list{"configure-pmts", ...remainingPath} =>
       <AccessControl
-        permission={userHasAccess(~permission=ConnectorsView)}
+        permission={userHasAccess(~groupACL=ConnectorsView)}
         isEnabled={featureFlagDetails.configurePmts}>
         <FilterContext key="ConfigurePmts" index="ConfigurePmts">
           <EntityScaffold
@@ -121,7 +120,7 @@ let make = () => {
       </AccessControl>
     // Routing
     | list{"routing", ...remainingPath} =>
-      <AccessControl permission={userHasAccess(~permission=WorkflowsView)}>
+      <AccessControl permission={userHasAccess(~groupACL=WorkflowsView)}>
         <EntityScaffold
           entityName="Routing"
           remainingPath
@@ -131,7 +130,7 @@ let make = () => {
       </AccessControl>
     | list{"payoutrouting", ...remainingPath} =>
       <AccessControl
-        isEnabled={featureFlagDetails.payOut} permission={userHasAccess(~permission=WorkflowsView)}>
+        isEnabled={featureFlagDetails.payOut} permission={userHasAccess(~groupACL=WorkflowsView)}>
         <EntityScaffold
           entityName="PayoutRouting"
           remainingPath
diff --git a/src/container/MerchantAccountContainer.res b/src/container/MerchantAccountContainer.res
index 7f2dccd31..983e8a89f 100644
--- a/src/container/MerchantAccountContainer.res
+++ b/src/container/MerchantAccountContainer.res
@@ -7,7 +7,7 @@ let make = () => {
   open HyperswitchAtom
   let url = RescriptReactRouter.useUrl()
   let (surveyModal, setSurveyModal) = React.useState(_ => false)
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let featureFlagDetails = featureFlagAtom->Recoil.useRecoilValueFromAtom
   let fetchConnectorListResponse = ConnectorListHook.useFetchConnectorList()
   let fetchBusinessProfiles = BusinessProfileHook.useFetchBusinessProfiles()
@@ -20,7 +20,7 @@ let make = () => {
       setScreenState(_ => PageLoaderWrapper.Loading)
 
       let _ = await fetchMerchantAccountDetails()
-      if userHasAccess(~permission=ConnectorsView) === Access {
+      if userHasAccess(~groupACL=ConnectorsView) === Access {
         if !featureFlagDetails.isLiveMode {
           let _ = await fetchConnectorListResponse()
           let _ = await fetchBusinessProfiles()
@@ -59,7 +59,7 @@ let make = () => {
       | list{"sdk"} =>
         <AccessControl
           isEnabled={!featureFlagDetails.isLiveMode}
-          permission={userHasAccess(~permission=ConnectorsView)}>
+          permission={userHasAccess(~groupACL=ConnectorsView)}>
           <SDKPage />
         </AccessControl>
       | list{"unauthorized"} => <UnauthorizedPage />
@@ -67,7 +67,7 @@ let make = () => {
       }}
       <RenderIf
         condition={!featureFlagDetails.isLiveMode &&
-        userHasAccess(~permission=MerchantDetailsManage) === Access &&
+        userHasAccess(~groupACL=MerchantDetailsManage) === Access &&
         merchantDetailsTypedValue.merchant_name->Option.isNone}>
         <SbxOnboardingSurvey showModal=surveyModal setShowModal=setSurveyModal />
       </RenderIf>
diff --git a/src/container/TransactionContainer.res b/src/container/TransactionContainer.res
index 1c585d268..b2c0158ef 100644
--- a/src/container/TransactionContainer.res
+++ b/src/container/TransactionContainer.res
@@ -4,13 +4,13 @@ let make = () => {
   open HyperswitchAtom
   let url = RescriptReactRouter.useUrl()
 
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let {userInfo: {transactionEntity}} = React.useContext(UserInfoProvider.defaultContext)
   let {payOut} = featureFlagAtom->Recoil.useRecoilValueFromAtom
   <div key={(transactionEntity :> string)}>
     {switch url.path->urlPath {
     | list{"payments", ...remainingPath} =>
-      <AccessControl permission={userHasAccess(~permission=OperationsView)}>
+      <AccessControl permission={userHasAccess(~groupACL=OperationsView)}>
         <FilterContext key="payments" index="payments">
           <EntityScaffold
             entityName="Payments"
@@ -22,7 +22,7 @@ let make = () => {
         </FilterContext>
       </AccessControl>
     | list{"payouts", ...remainingPath} =>
-      <AccessControl isEnabled={payOut} permission={userHasAccess(~permission=OperationsView)}>
+      <AccessControl isEnabled={payOut} permission={userHasAccess(~groupACL=OperationsView)}>
         <FilterContext key="payouts" index="payouts">
           <EntityScaffold
             entityName="Payouts"
@@ -34,7 +34,7 @@ let make = () => {
         </FilterContext>
       </AccessControl>
     | list{"refunds", ...remainingPath} =>
-      <AccessControl permission={userHasAccess(~permission=OperationsView)}>
+      <AccessControl permission={userHasAccess(~groupACL=OperationsView)}>
         <FilterContext key="refunds" index="refunds">
           <EntityScaffold
             entityName="Refunds"
@@ -46,7 +46,7 @@ let make = () => {
         </FilterContext>
       </AccessControl>
     | list{"disputes", ...remainingPath} =>
-      <AccessControl permission={userHasAccess(~permission=OperationsView)}>
+      <AccessControl permission={userHasAccess(~groupACL=OperationsView)}>
         <FilterContext key="disputes" index="disputes">
           <EntityScaffold
             entityName="Disputes"
diff --git a/src/container/UserManagementContainer.res b/src/container/UserManagementContainer.res
index 941bd1840..2d3dce91b 100644
--- a/src/container/UserManagementContainer.res
+++ b/src/container/UserManagementContainer.res
@@ -14,13 +14,13 @@ let make = () => {
   let getURL = useGetURL()
   let fetchDetails = useGetMethod()
   let url = RescriptReactRouter.useUrl()
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Loading)
   let setRoleInfo = Recoil.useSetRecoilState(HyperswitchAtom.moduleListRecoil)
 
   let fetchModuleList = async () => {
     try {
-      if userHasAccess(~permission=UsersManage) === Access {
+      if userHasAccess(~groupACL=UsersManage) === Access {
         let url = getURL(
           ~entityName=USERS,
           ~userType=#ROLE_INFO,
@@ -47,15 +47,15 @@ let make = () => {
     {switch url.path->urlPath {
     // User Management modules
     | list{"users", "invite-users"} =>
-      <AccessControl permission={userHasAccess(~permission=UsersManage)}>
+      <AccessControl permission={userHasAccess(~groupACL=UsersManage)}>
         <InviteMember />
       </AccessControl>
     | list{"users", "create-custom-role"} =>
-      <AccessControl permission={userHasAccess(~permission=UsersManage)}>
+      <AccessControl permission={userHasAccess(~groupACL=UsersManage)}>
         <CreateCustomRole baseUrl="users" breadCrumbHeader="Team management" />
       </AccessControl>
     | list{"users", ...remainingPath} =>
-      <AccessControl permission={userHasAccess(~permission=UsersView)}>
+      <AccessControl permission={userHasAccess(~groupACL=UsersView)}>
         <EntityScaffold
           entityName="UserManagement"
           remainingPath
diff --git a/src/entryPoints/HyperSwitchApp.res b/src/entryPoints/HyperSwitchApp.res
index 7f58232a2..f2c75c579 100644
--- a/src/entryPoints/HyperSwitchApp.res
+++ b/src/entryPoints/HyperSwitchApp.res
@@ -17,10 +17,8 @@ let make = () => {
   let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Loading)
   let merchantDetailsTypedValue = Recoil.useRecoilValueFromAtom(merchantDetailsValueAtom)
   let featureFlagDetails = featureFlagAtom->Recoil.useRecoilValueFromAtom
-  let (userGroupPermissions, setuserGroupPermissions) = Recoil.useRecoilState(
-    userGroupPermissionsAtom,
-  )
-  let {fetchUserGroupPermissions, userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let (userGroupACL, setuserGroupACL) = Recoil.useRecoilState(userGroupACLAtom)
+  let {fetchUserGroupACL, userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let {userInfo: {orgId, merchantId, profileId, roleId}, checkUserEntity} = React.useContext(
     UserInfoProvider.defaultContext,
   )
@@ -43,9 +41,9 @@ let make = () => {
   let setUpDashboard = async () => {
     try {
       // NOTE: Treat permission map similar to screenstate
-      setuserGroupPermissions(_ => None)
+      setuserGroupACL(_ => None)
       Window.connectorWasmInit()->ignore
-      let _ = await fetchUserGroupPermissions()
+      let _ = await fetchUserGroupACL()
       switch url.path->urlPath {
       | list{"unauthorized"} => RescriptReactRouter.push(appendDashboardPath(~url="/home"))
       | _ => ()
@@ -71,11 +69,11 @@ let make = () => {
   }, (featureFlagDetails.mixpanel, path))
 
   React.useEffect1(() => {
-    if userGroupPermissions->Option.isSome {
+    if userGroupACL->Option.isSome {
       setScreenState(_ => PageLoaderWrapper.Success)
     }
     None
-  }, [userGroupPermissions])
+  }, [userGroupACL])
 
   <>
     <PageLoaderWrapper screenState={screenState} sectionHeight="!h-screen" showLogoutButton=true>
@@ -163,14 +161,14 @@ let make = () => {
                         | list{"new-analytics-payment"} =>
                           <AccessControl
                             isEnabled={featureFlagDetails.newAnalytics}
-                            permission={userHasAccess(~permission=AnalyticsView)}>
+                            permission={userHasAccess(~groupACL=AnalyticsView)}>
                             <FilterContext key="NewAnalytics" index="NewAnalytics">
                               <NewAnalyticsContainer />
                             </FilterContext>
                           </AccessControl>
                         | list{"customers", ...remainingPath} =>
                           <AccessControl
-                            permission={userHasAccess(~permission=OperationsView)}
+                            permission={userHasAccess(~groupACL=OperationsView)}
                             isEnabled={[#Organization, #Merchant]->checkUserEntity}>
                             <EntityScaffold
                               entityName="Customers"
@@ -185,7 +183,7 @@ let make = () => {
                           <AccessControl
                             isEnabled={featureFlagDetails.userJourneyAnalytics &&
                             [#Organization, #Merchant]->checkUserEntity}
-                            permission={userHasAccess(~permission=AnalyticsView)}>
+                            permission={userHasAccess(~groupACL=AnalyticsView)}>
                             <FilterContext key="UserJourneyAnalytics" index="UserJourneyAnalytics">
                               <UserJourneyAnalytics />
                             </FilterContext>
@@ -194,7 +192,7 @@ let make = () => {
                           <AccessControl
                             isEnabled={featureFlagDetails.authenticationAnalytics &&
                             [#Organization, #Merchant]->checkUserEntity}
-                            permission={userHasAccess(~permission=AnalyticsView)}>
+                            permission={userHasAccess(~groupACL=AnalyticsView)}>
                             <FilterContext
                               key="AuthenticationAnalytics" index="AuthenticationAnalytics">
                               <AuthenticationAnalytics />
@@ -202,14 +200,14 @@ let make = () => {
                           </AccessControl>
                         | list{"developer-api-keys"} =>
                           <AccessControl
-                            permission={userHasAccess(~permission=MerchantDetailsManage)}
+                            permission={userHasAccess(~groupACL=MerchantDetailsManage)}
                             isEnabled={!checkUserEntity([#Profile])}>
                             <KeyManagement.KeysManagement />
                           </AccessControl>
                         | list{"developer-system-metrics"} =>
                           <AccessControl
                             isEnabled={isInternalUser && featureFlagDetails.systemMetrics}
-                            permission={userHasAccess(~permission=AnalyticsView)}>
+                            permission={userHasAccess(~groupACL=AnalyticsView)}>
                             <FilterContext key="SystemMetrics" index="SystemMetrics">
                               <SystemMetricsAnalytics />
                             </FilterContext>
@@ -221,19 +219,19 @@ let make = () => {
                             <Compliance />
                           </AccessControl>
                         | list{"3ds"} =>
-                          <AccessControl permission={userHasAccess(~permission=WorkflowsView)}>
+                          <AccessControl permission={userHasAccess(~groupACL=WorkflowsView)}>
                             <HSwitchThreeDS />
                           </AccessControl>
                         | list{"surcharge"} =>
                           <AccessControl
                             isEnabled={featureFlagDetails.surcharge}
-                            permission={userHasAccess(~permission=WorkflowsView)}>
+                            permission={userHasAccess(~groupACL=WorkflowsView)}>
                             <Surcharge />
                           </AccessControl>
                         | list{"account-settings"} =>
                           <AccessControl
                             isEnabled=featureFlagDetails.sampleData
-                            permission={userHasAccess(~permission=MerchantDetailsManage)}>
+                            permission={userHasAccess(~groupACL=MerchantDetailsManage)}>
                             <HSwitchSettings />
                           </AccessControl>
                         | list{"account-settings", "profile", ...remainingPath} =>
@@ -247,25 +245,25 @@ let make = () => {
                         | list{"payment-attempts"} =>
                           <AccessControl
                             isEnabled={featureFlagDetails.globalSearch}
-                            permission={userHasAccess(~permission=OperationsView)}>
+                            permission={userHasAccess(~groupACL=OperationsView)}>
                             <PaymentAttemptTable />
                           </AccessControl>
                         | list{"payment-intents"} =>
                           <AccessControl
                             isEnabled={featureFlagDetails.globalSearch}
-                            permission={userHasAccess(~permission=OperationsView)}>
+                            permission={userHasAccess(~groupACL=OperationsView)}>
                             <PaymentIntentTable />
                           </AccessControl>
                         | list{"refunds-global"} =>
                           <AccessControl
                             isEnabled={featureFlagDetails.globalSearch}
-                            permission={userHasAccess(~permission=OperationsView)}>
+                            permission={userHasAccess(~groupACL=OperationsView)}>
                             <RefundsTable />
                           </AccessControl>
                         | list{"dispute-global"} =>
                           <AccessControl
                             isEnabled={featureFlagDetails.globalSearch}
-                            permission={userHasAccess(~permission=OperationsView)}>
+                            permission={userHasAccess(~groupACL=OperationsView)}>
                             <DisputeTable />
                           </AccessControl>
                         | list{"unauthorized"} => <UnauthorizedPage />
diff --git a/src/entryPoints/SidebarValues.res b/src/entryPoints/SidebarValues.res
index 63b8def38..ca021af09 100644
--- a/src/entryPoints/SidebarValues.res
+++ b/src/entryPoints/SidebarValues.res
@@ -51,7 +51,7 @@ let emptyComponent = CustomComponent({
 
 let productionAccessComponent = (isProductionAccessEnabled, userHasAccess) =>
   isProductionAccessEnabled &&
-  userHasAccess(~permission=MerchantDetailsManage) === CommonAuthTypes.Access
+  userHasAccess(~groupACL=MerchantDetailsManage) === CommonAuthTypes.Access
     ? CustomComponent({
         component: <GetProductionAccess />,
       })
@@ -73,7 +73,7 @@ let payments = userHasAccess => {
   SubLevelLink({
     name: "Payments",
     link: `/payments`,
-    access: userHasAccess(~permission=OperationsView),
+    access: userHasAccess(~groupACL=OperationsView),
     searchOptions: [("View payment operations", "")],
   })
 }
@@ -82,7 +82,7 @@ let refunds = userHasAccess => {
   SubLevelLink({
     name: "Refunds",
     link: `/refunds`,
-    access: userHasAccess(~permission=OperationsView),
+    access: userHasAccess(~groupACL=OperationsView),
     searchOptions: [("View refund operations", "")],
   })
 }
@@ -91,7 +91,7 @@ let disputes = userHasAccess => {
   SubLevelLink({
     name: "Disputes",
     link: `/disputes`,
-    access: userHasAccess(~permission=OperationsView),
+    access: userHasAccess(~groupACL=OperationsView),
     searchOptions: [("View dispute operations", "")],
   })
 }
@@ -100,7 +100,7 @@ let customers = userHasAccess => {
   SubLevelLink({
     name: "Customers",
     link: `/customers`,
-    access: userHasAccess(~permission=OperationsView),
+    access: userHasAccess(~groupACL=OperationsView),
     searchOptions: [("View customers", "")],
   })
 }
@@ -109,7 +109,7 @@ let payouts = userHasAccess => {
   SubLevelLink({
     name: "Payouts",
     link: `/payouts`,
-    access: userHasAccess(~permission=OperationsView),
+    access: userHasAccess(~groupACL=OperationsView),
     searchOptions: [("View payouts operations", "")],
   })
 }
@@ -145,7 +145,7 @@ let paymentProcessor = (isLiveMode, userHasAccess) => {
   SubLevelLink({
     name: "Payment Processors",
     link: `/connectors`,
-    access: userHasAccess(~permission=ConnectorsView),
+    access: userHasAccess(~groupACL=ConnectorsView),
     searchOptions: HSwitchUtils.getSearchOptionsForProcessors(
       ~processorList=isLiveMode
         ? ConnectorUtils.connectorListForLive
@@ -159,7 +159,7 @@ let payoutConnectors = (~userHasAccess) => {
   SubLevelLink({
     name: "Payout Processors",
     link: `/payoutconnectors`,
-    access: userHasAccess(~permission=ConnectorsView),
+    access: userHasAccess(~groupACL=ConnectorsView),
     searchOptions: HSwitchUtils.getSearchOptionsForProcessors(
       ~processorList=ConnectorUtils.payoutConnectorList,
       ~getNameFromString=ConnectorUtils.getConnectorNameString,
@@ -171,7 +171,7 @@ let fraudAndRisk = (~userHasAccess) => {
   SubLevelLink({
     name: "Fraud & Risk",
     link: `/fraud-risk-management`,
-    access: userHasAccess(~permission=ConnectorsView),
+    access: userHasAccess(~groupACL=ConnectorsView),
     searchOptions: [],
   })
 }
@@ -180,7 +180,7 @@ let threeDsConnector = (~userHasAccess) => {
   SubLevelLink({
     name: "3DS Authenticator",
     link: "/3ds-authenticators",
-    access: userHasAccess(~permission=ConnectorsView),
+    access: userHasAccess(~groupACL=ConnectorsView),
     searchOptions: [
       ("Connect 3dsecure.io", "/new?name=threedsecureio"),
       ("Connect threedsecureio", "/new?name=threedsecureio"),
@@ -192,7 +192,7 @@ let pmAuthenticationProcessor = (~userHasAccess) => {
   SubLevelLink({
     name: "PM Authentication Processor",
     link: `/pm-authentication-processor`,
-    access: userHasAccess(~permission=ConnectorsView),
+    access: userHasAccess(~groupACL=ConnectorsView),
     searchOptions: HSwitchUtils.getSearchOptionsForProcessors(
       ~processorList=ConnectorUtils.pmAuthenticationConnectorList,
       ~getNameFromString=ConnectorUtils.getConnectorNameString,
@@ -204,7 +204,7 @@ let taxProcessor = (~userHasAccess) => {
   SubLevelLink({
     name: "Tax Processor",
     link: `/tax-processor`,
-    access: userHasAccess(~permission=ConnectorsView),
+    access: userHasAccess(~groupACL=ConnectorsView),
     searchOptions: HSwitchUtils.getSearchOptionsForProcessors(
       ~processorList=ConnectorUtils.taxProcessorList,
       ~getNameFromString=ConnectorUtils.getConnectorNameString,
@@ -338,7 +338,7 @@ let analytics = (
     ? Section({
         name: "Analytics",
         icon: "analytics",
-        showSection: userHasAccess(~permission=AnalyticsView) === CommonAuthTypes.Access,
+        showSection: userHasAccess(~groupACL=AnalyticsView) === CommonAuthTypes.Access,
         links,
       })
     : emptyComponent
@@ -347,7 +347,7 @@ let routing = userHasAccess => {
   SubLevelLink({
     name: "Routing",
     link: `/routing`,
-    access: userHasAccess(~permission=WorkflowsView),
+    access: userHasAccess(~groupACL=WorkflowsView),
     searchOptions: [
       ("Manage default routing configuration", "/default"),
       ("Create new volume based routing", "/volume"),
@@ -361,7 +361,7 @@ let payoutRouting = userHasAccess => {
   SubLevelLink({
     name: "Payout Routing",
     link: `/payoutrouting`,
-    access: userHasAccess(~permission=WorkflowsView),
+    access: userHasAccess(~groupACL=WorkflowsView),
     searchOptions: [
       ("Manage default routing configuration", "/default"),
       ("Create new volume based routing", "/volume"),
@@ -375,7 +375,7 @@ let threeDs = userHasAccess => {
   SubLevelLink({
     name: "3DS Decision Manager",
     link: `/3ds`,
-    access: userHasAccess(~permission=WorkflowsView),
+    access: userHasAccess(~groupACL=WorkflowsView),
     searchOptions: [("Configure 3ds", "")],
   })
 }
@@ -383,7 +383,7 @@ let surcharge = userHasAccess => {
   SubLevelLink({
     name: "Surcharge",
     link: `/surcharge`,
-    access: userHasAccess(~permission=WorkflowsView),
+    access: userHasAccess(~groupACL=WorkflowsView),
     searchOptions: [("Add Surcharge", "")],
   })
 }
@@ -427,7 +427,7 @@ let userManagement = userHasAccess => {
   SubLevelLink({
     name: "Users",
     link: `/users`,
-    access: userHasAccess(~permission=UsersView),
+    access: userHasAccess(~groupACL=UsersView),
     searchOptions: [("View user management", "")],
   })
 }
@@ -454,7 +454,7 @@ let configurePMTs = userHasAccess => {
   SubLevelLink({
     name: "Configure PMTs",
     link: `/configure-pmts`,
-    access: userHasAccess(~permission=ConnectorsView),
+    access: userHasAccess(~groupACL=ConnectorsView),
     searchOptions: [("Configure payment methods", "Configure country currency")],
   })
 }
@@ -493,7 +493,7 @@ let apiKeys = userHasAccess => {
   SubLevelLink({
     name: "API Keys",
     link: `/developer-api-keys`,
-    access: userHasAccess(~permission=MerchantDetailsManage),
+    access: userHasAccess(~groupACL=MerchantDetailsManage),
     searchOptions: [("View API Keys", "")],
   })
 }
@@ -502,7 +502,7 @@ let systemMetric = userHasAccess => {
   SubLevelLink({
     name: "System Metrics",
     link: `/developer-system-metrics`,
-    access: userHasAccess(~permission=AnalyticsView),
+    access: userHasAccess(~groupACL=AnalyticsView),
     iconTag: "betaTag",
     searchOptions: [("View System Metrics", "")],
   })
@@ -631,7 +631,7 @@ let reconAndSettlement = (recon, isReconEnabled, checkUserEntity) => {
 
 let useGetSidebarValues = (~isReconEnabled: bool) => {
   let featureFlagDetails = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let {userInfo: {userEntity, roleId}, checkUserEntity} = React.useContext(
     UserInfoProvider.defaultContext,
   )
diff --git a/src/screens/Analytics/GlobalSearch/GlobalSearchBar.res b/src/screens/Analytics/GlobalSearch/GlobalSearchBar.res
index 6d4b11033..44dd59609 100644
--- a/src/screens/Analytics/GlobalSearch/GlobalSearchBar.res
+++ b/src/screens/Analytics/GlobalSearch/GlobalSearchBar.res
@@ -215,8 +215,8 @@ let make = () => {
   let searchText = searchText->String.trim
   let loader = LottieFiles.useLottieJson("loader-circle.json")
   let {globalSearch} = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
-  let isShowRemoteResults = globalSearch && userHasAccess(~permission=OperationsView) === Access
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
+  let isShowRemoteResults = globalSearch && userHasAccess(~groupACL=OperationsView) === Access
   let mixpanelEvent = MixpanelHook.useSendEvent()
   let {userInfo: {merchantId}} = React.useContext(UserInfoProvider.defaultContext)
 
diff --git a/src/screens/Analytics/GlobalSearchResults/SearchResultsPage.res b/src/screens/Analytics/GlobalSearchResults/SearchResultsPage.res
index 039a5fcc2..d2de332d0 100644
--- a/src/screens/Analytics/GlobalSearchResults/SearchResultsPage.res
+++ b/src/screens/Analytics/GlobalSearchResults/SearchResultsPage.res
@@ -91,9 +91,9 @@ let make = () => {
   let hswitchTabs = SidebarValues.useGetSidebarValues(~isReconEnabled)
   let query = UrlUtils.useGetFilterDictFromUrl("")->getString("query", "")
   let {globalSearch} = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let {userInfo: {merchantId}} = React.useContext(UserInfoProvider.defaultContext)
-  let isShowRemoteResults = globalSearch && userHasAccess(~permission=OperationsView) === Access
+  let isShowRemoteResults = globalSearch && userHasAccess(~groupACL=OperationsView) === Access
 
   let getSearchResults = async results => {
     try {
diff --git a/src/screens/Analytics/HomePageOverview/HomePageOverviewComponent.res b/src/screens/Analytics/HomePageOverview/HomePageOverviewComponent.res
index a8fcf4277..05578220e 100644
--- a/src/screens/Analytics/HomePageOverview/HomePageOverviewComponent.res
+++ b/src/screens/Analytics/HomePageOverview/HomePageOverviewComponent.res
@@ -4,7 +4,7 @@ module ConnectorOverview = {
   @react.component
   let make = () => {
     open ConnectorUtils
-    let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
     let {globalUIConfig: {backgroundColor}} = React.useContext(ThemeProvider.themeContext)
     let connectorsList =
       HyperswitchAtom.connectorListAtom
@@ -52,7 +52,7 @@ module ConnectorOverview = {
         </div>
         <ACLButton
           text="+ Add More"
-          access={userHasAccess(~permission=ConnectorsView)}
+          access={userHasAccess(~groupACL=ConnectorsView)}
           buttonType={PrimaryOutline}
           customButtonStyle="w-10 !px-3"
           buttonSize={Small}
@@ -198,13 +198,13 @@ module OverviewInfo = {
 @react.component
 let make = () => {
   let {systemMetrics} = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
   <div className="flex flex-col gap-4">
     <p className=headingStyle> {"Overview"->React.string} </p>
     <div className="grid grid-cols-1 md:grid-cols-3 w-full gap-4">
       <ConnectorOverview />
-      <RenderIf condition={userHasAccess(~permission=AnalyticsView) === Access}>
+      <RenderIf condition={userHasAccess(~groupACL=AnalyticsView) === Access}>
         <PaymentOverview />
       </RenderIf>
       <RenderIf condition={systemMetrics}>
diff --git a/src/screens/ConfigurePMTs/PaymentMethodConfig.res b/src/screens/ConfigurePMTs/PaymentMethodConfig.res
index c2c1511ea..0c33352ce 100644
--- a/src/screens/ConfigurePMTs/PaymentMethodConfig.res
+++ b/src/screens/ConfigurePMTs/PaymentMethodConfig.res
@@ -71,7 +71,7 @@ let make = (
   ~element: option<React.element>=?,
 ) => {
   open FormRenderer
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
   let (showPaymentMthdConfigModal, setShowPaymentMthdConfigModal) = React.useState(_ => false)
   let (initialValues, setInitialValues) = React.useState(_ => Dict.make()->JSON.Encode.object)
@@ -196,7 +196,7 @@ let make = (
       </Modal>
     </RenderIf>
     <ACLDiv
-      permission={userHasAccess(~permission=ConnectorsManage)}
+      permission={userHasAccess(~groupACL=ConnectorsManage)}
       className="cursor-pointer w-150"
       onClick={_ => getProcessorDetails()->ignore}>
       {switch element {
diff --git a/src/screens/Connectors/ConnectorList.res b/src/screens/Connectors/ConnectorList.res
index 86f6e8ac8..35852ff91 100644
--- a/src/screens/Connectors/ConnectorList.res
+++ b/src/screens/Connectors/ConnectorList.res
@@ -10,7 +10,7 @@ let make = (~isPayoutFlow=false) => {
   let (searchText, setSearchText) = React.useState(_ => "")
   let (processorModal, setProcessorModal) = React.useState(_ => false)
   let connectorListFromRecoil = HyperswitchAtom.connectorListAtom->Recoil.useRecoilValueFromAtom
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let featureFlagDetails = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
 
   let textStyle = HSwitchUtils.getTextClass((H2, Optional))
@@ -139,7 +139,7 @@ let make = (~isPayoutFlow=false) => {
             setOffset
             entity={ConnectorTableUtils.connectorEntity(
               `${entityPrefix}connectors`,
-              ~permission=userHasAccess(~permission=ConnectorsManage),
+              ~permission=userHasAccess(~groupACL=ConnectorsManage),
             )}
             currrentFetchCount={filteredConnectorData->Array.length}
             collapseTableRow=false
diff --git a/src/screens/Developer/APIKeys/KeyManagement.res b/src/screens/Developer/APIKeys/KeyManagement.res
index b949b186a..f9ff943b1 100644
--- a/src/screens/Developer/APIKeys/KeyManagement.res
+++ b/src/screens/Developer/APIKeys/KeyManagement.res
@@ -177,7 +177,7 @@ module ApiKeyAddBtn = {
   @react.component
   let make = (~getAPIKeyDetails) => {
     let mixpanelEvent = MixpanelHook.useSendEvent()
-    let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
     let (showModal, setShowModal) = React.useState(_ => false)
     let initialValues = Dict.make()
     initialValues->Dict.set("expiration", Never->getStringFromRecordType->JSON.Encode.string)
@@ -191,7 +191,7 @@ module ApiKeyAddBtn = {
             name="plus" size=12 className="jp-gray-900 fill-opacity-50 dark:jp-gray-text_darktheme"
           />,
         )}
-        access={userHasAccess(~permission=MerchantDetailsManage)}
+        access={userHasAccess(~groupACL=MerchantDetailsManage)}
         buttonType=Secondary
         buttonSize=Small
         onClick={_ => {
diff --git a/src/screens/Developer/PaymentSettings/PaymentSettingsList.res b/src/screens/Developer/PaymentSettings/PaymentSettingsList.res
index 16583e1b9..08f4aa260 100644
--- a/src/screens/Developer/PaymentSettings/PaymentSettingsList.res
+++ b/src/screens/Developer/PaymentSettings/PaymentSettingsList.res
@@ -6,7 +6,7 @@ let make = (
 ) => {
   open PaymentSettingsListEntity
   let (offset, setOffset) = React.useState(_ => 0)
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let businessProfileValues = HyperswitchAtom.businessProfilesAtom->Recoil.useRecoilValueFromAtom
 
   <RenderIf condition=isFromSettings>
@@ -22,7 +22,7 @@ let make = (
           resultsPerPage=7
           visibleColumns
           entity={webhookProfileTableEntity(
-            ~permission=userHasAccess(~permission=MerchantDetailsManage),
+            ~permission=userHasAccess(~groupACL=MerchantDetailsManage),
           )}
           showSerialNumber=true
           actualData={businessProfileValues->Array.map(Nullable.make)}
diff --git a/src/screens/Disputes/ShowDisputes.res b/src/screens/Disputes/ShowDisputes.res
index b0199ef41..0b4a8acb7 100644
--- a/src/screens/Disputes/ShowDisputes.res
+++ b/src/screens/Disputes/ShowDisputes.res
@@ -173,7 +173,7 @@ let make = (~id, ~profileId) => {
   let url = RescriptReactRouter.useUrl()
   let getURL = useGetURL()
   let fetchDetails = useGetMethod()
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Loading)
   let featureFlagDetails = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
   let (disputeData, setDisputeData) = React.useState(_ => JSON.Encode.null)
@@ -221,7 +221,7 @@ let make = (~id, ~profileId) => {
       <div className="mt-5" />
       <RenderIf
         condition={featureFlagDetails.auditTrail &&
-        userHasAccess(~permission=AnalyticsView) == Access}>
+        userHasAccess(~groupACL=AnalyticsView) == Access}>
         <OrderUIUtils.RenderAccordian
           accordion={[
             {
diff --git a/src/screens/FraudAndRisk/FRMSelect.res b/src/screens/FraudAndRisk/FRMSelect.res
index 257beb00c..0e5a795c4 100644
--- a/src/screens/FraudAndRisk/FRMSelect.res
+++ b/src/screens/FraudAndRisk/FRMSelect.res
@@ -2,7 +2,7 @@ module NewProcessorCards = {
   open FRMInfo
   @react.component
   let make = (~configuredFRMs: array<ConnectorTypes.connectorTypes>) => {
-    let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
     let mixpanelEvent = MixpanelHook.useSendEvent()
     let frmAvailableForIntegration = frmList
     let unConfiguredFRMs = frmAvailableForIntegration->Array.filter(total =>
@@ -47,7 +47,7 @@ module NewProcessorCards = {
               </div>
               <ACLButton
                 text="Connect"
-                access={userHasAccess(~permission=ConnectorsManage)}
+                access={userHasAccess(~groupACL=ConnectorsManage)}
                 buttonType=Secondary
                 buttonSize=Small
                 onClick={_ => handleClick(frmName)}
@@ -82,7 +82,7 @@ let make = () => {
   let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Loading)
   let fetchDetails = APIUtils.useGetMethod()
   let isMobileView = MatchMedia.useMatchMedia("(max-width: 844px)")
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let (
     configuredFRMs: array<ConnectorTypes.connectorTypes>,
     setConfiguredFRMs,
@@ -180,7 +180,7 @@ let make = () => {
           setOffset
           entity={FRMTableUtils.connectorEntity(
             "fraud-risk-management",
-            ~permission={userHasAccess(~permission=ConnectorsManage)},
+            ~permission={userHasAccess(~groupACL=ConnectorsManage)},
           )}
           currrentFetchCount={filteredFRMData->Array.length}
           collapseTableRow=false
diff --git a/src/screens/GenerateReports/GenerateReport.res b/src/screens/GenerateReports/GenerateReport.res
index 5d9c0af49..50de70a9f 100644
--- a/src/screens/GenerateReports/GenerateReport.res
+++ b/src/screens/GenerateReports/GenerateReport.res
@@ -2,11 +2,11 @@
 let make = (~entityName) => {
   let mixpanelEvent = MixpanelHook.useSendEvent()
   let (reportModal, setReportModal) = React.useState(_ => false)
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
-  let accessForGenerateReports = PermissionMapper.hasAnyPermission(
-    userHasAccess(~permission=OperationsView),
-    userHasAccess(~permission=AnalyticsView),
+  let accessForGenerateReports = GroupACLMapper.hasAnyPermission(
+    userHasAccess(~groupACL=OperationsView),
+    userHasAccess(~groupACL=AnalyticsView),
   )
 
   <>
diff --git a/src/screens/Hooks/ClearRecoilValueHook.res b/src/screens/Hooks/ClearRecoilValueHook.res
index 7e6dbf2fe..e8b0991ed 100644
--- a/src/screens/Hooks/ClearRecoilValueHook.res
+++ b/src/screens/Hooks/ClearRecoilValueHook.res
@@ -7,7 +7,7 @@ let useClearRecoilValue = () => {
   let setEnumVariantAtom = enumVariantAtom->Recoil.useSetRecoilState
   let setPaypalAccountStatusAtom = paypalAccountStatusAtom->Recoil.useSetRecoilState
   let setUserPermissionAtom = userPermissionAtom->Recoil.useSetRecoilState
-  let setUserGroupPermissionsAtom = userGroupPermissionsAtom->Recoil.useSetRecoilState
+  let setUserGroupACLAtom = userGroupACLAtom->Recoil.useSetRecoilState
   let setSwitchMerchantListAtom = switchMerchantListAtom->Recoil.useSetRecoilState
   let setCurrentTabNameRecoilAtom = currentTabNameRecoilAtom->Recoil.useSetRecoilState
   let setOrgListRecoilAtom = orgListAtom->Recoil.useSetRecoilState
@@ -23,8 +23,8 @@ let useClearRecoilValue = () => {
     )
     setEnumVariantAtom(_ => "")
     setPaypalAccountStatusAtom(_ => PayPalFlowTypes.Connect_paypal_landing)
-    setUserPermissionAtom(_ => PermissionMapper.defaultValueForPermission)
-    setUserGroupPermissionsAtom(_ => None)
+    setUserPermissionAtom(_ => GroupACLMapper.defaultValueForPermission)
+    setUserGroupACLAtom(_ => None)
     setSwitchMerchantListAtom(_ => [SwitchMerchantUtils.defaultValue])
     setCurrentTabNameRecoilAtom(_ => "ActiveTab")
     setOrgListRecoilAtom(_ => OMPSwitchUtils.ompDefaultValue("", ""))
diff --git a/src/screens/Hooks/PermissionHooks.res b/src/screens/Hooks/GroupACLHooks.res
similarity index 61%
rename from src/screens/Hooks/PermissionHooks.res
rename to src/screens/Hooks/GroupACLHooks.res
index f80baa2d3..1c55fa8ea 100644
--- a/src/screens/Hooks/PermissionHooks.res
+++ b/src/screens/Hooks/GroupACLHooks.res
@@ -1,21 +1,19 @@
 type userPermissionType = {
-  fetchUserGroupPermissions: unit => promise<UserManagementTypes.permissionJson>,
-  userHasAccess: (~permission: UserManagementTypes.permissionType) => CommonAuthTypes.authorization,
+  fetchUserGroupACL: unit => promise<UserManagementTypes.permissionJson>,
+  userHasAccess: (~groupACL: UserManagementTypes.permissionType) => CommonAuthTypes.authorization,
 }
 
-let useUserGroupPermissionsHook = () => {
+let useUserGroupACLHook = () => {
   open APIUtils
   open LogicUtils
-  open PermissionMapper
+  open GroupACLMapper
   open HyperswitchAtom
   let getURL = useGetURL()
   let fetchDetails = useGetMethod()
-  let (userGroupPermissions, setuserGroupPermissions) = Recoil.useRecoilState(
-    userGroupPermissionsAtom,
-  )
+  let (userGroupACL, setuserGroupACL) = Recoil.useRecoilState(userGroupACLAtom)
   let setuserPermissionJson = Recoil.useSetRecoilState(userPermissionAtom)
 
-  let fetchUserGroupPermissions = async () => {
+  let fetchUserGroupACL = async () => {
     try {
       let url = getURL(
         ~entityName=USERS,
@@ -26,9 +24,9 @@ let useUserGroupPermissionsHook = () => {
       let response = await fetchDetails(url)
       let permissionsValue =
         response->getArrayFromJson([])->Array.map(ele => ele->JSON.Decode.string->Option.getOr(""))
-      setuserGroupPermissions(_ => Some(
+      setuserGroupACL(_ => Some(
         permissionsValue
-        ->Array.map(ele => ele->PermissionMapper.mapStringToPermissionType)
+        ->Array.map(ele => ele->mapStringToPermissionType)
         ->convertValueToMap,
       ))
       let permissionJson =
@@ -43,10 +41,10 @@ let useUserGroupPermissionsHook = () => {
     }
   }
 
-  let userHasAccess = (~permission) => {
-    switch userGroupPermissions {
+  let userHasAccess = (~groupACL) => {
+    switch userGroupACL {
     | Some(groupPermissions) =>
-      switch groupPermissions->Map.get(permission) {
+      switch groupPermissions->Map.get(groupACL) {
       | Some(value) => value
       | None => NoAccess
       }
@@ -54,5 +52,5 @@ let useUserGroupPermissionsHook = () => {
     }
   }
 
-  {fetchUserGroupPermissions, userHasAccess}
+  {fetchUserGroupACL, userHasAccess}
 }
diff --git a/src/screens/OMPSwitch/OMPSwitchHelper.res b/src/screens/OMPSwitch/OMPSwitchHelper.res
index 86a796acd..b3153eb5d 100644
--- a/src/screens/OMPSwitch/OMPSwitchHelper.res
+++ b/src/screens/OMPSwitch/OMPSwitchHelper.res
@@ -32,12 +32,10 @@ module AddNewMerchantProfileButton = {
     ~customHRTagStyle="",
     ~addItemBtnStyle="",
   ) => {
-    let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
-    let cursorStyles = PermissionUtils.cursorStyles(
-      userHasAccess(~permission=MerchantDetailsManage),
-    )
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
+    let cursorStyles = PermissionUtils.cursorStyles(userHasAccess(~groupACL=MerchantDetailsManage))
     <ACLDiv
-      permission={userHasAccess(~permission=MerchantDetailsManage)}
+      permission={userHasAccess(~groupACL=MerchantDetailsManage)}
       onClick={_ => setShowModal(_ => true)}
       isRelative=false
       contentAlign=Default
diff --git a/src/screens/Order/OrderUIUtils.res b/src/screens/Order/OrderUIUtils.res
index f5749f134..e27b57c57 100644
--- a/src/screens/Order/OrderUIUtils.res
+++ b/src/screens/Order/OrderUIUtils.res
@@ -56,7 +56,7 @@ module GenerateSampleDataButton = {
     let showToast = ToastState.useShowToast()
     let showPopUp = PopUpState.useShowPopUp()
     let {sampleData} = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
-    let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
     let generateSampleData = async () => {
       mixpanelEvent(~eventName="generate_sample_data")
@@ -116,7 +116,7 @@ module GenerateSampleDataButton = {
     <RenderIf condition={sampleData && !previewOnly}>
       <div className="flex items-start">
         <ACLButton
-          access={userHasAccess(~permission=OperationsManage)}
+          access={userHasAccess(~groupACL=OperationsManage)}
           buttonType={Secondary}
           buttonSize={XSmall}
           text="Generate Sample Data"
@@ -126,7 +126,7 @@ module GenerateSampleDataButton = {
         />
         <ACLDiv
           height="h-fit"
-          permission={userHasAccess(~permission=OperationsManage)}
+          permission={userHasAccess(~groupACL=OperationsManage)}
           className="bg-jp-gray-button_gray text-jp-gray-900 text-opacity-75 hover:bg-jp-gray-secondary_hover hover:text-jp-gray-890  focus:outline-none items-center border border-border_gray cursor-pointer p-2.5 overflow-hidden text-jp-gray-950 hover:text-black
           border flex items-center justify-center rounded-r-md"
           onClick={ev => rightIconClick(ev)}>
diff --git a/src/screens/Order/ShowOrder.res b/src/screens/Order/ShowOrder.res
index 7f5e0e1e2..08b2e4625 100644
--- a/src/screens/Order/ShowOrder.res
+++ b/src/screens/Order/ShowOrder.res
@@ -24,7 +24,7 @@ module ShowOrderDetails = {
     ~border="border border-jp-gray-940 border-opacity-75 dark:border-jp-gray-960",
     ~sectionTitle=?,
   ) => {
-    let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
     let typedPaymentStatus = paymentStatus->statusVariantMapper
     let statusUI = useGetStatus(data)
     <Section customCssClass={`${border} ${bgColor} rounded-md px-5 pt-5 h-full`}>
@@ -50,7 +50,7 @@ module ShowOrderDetails = {
           </div>
           {statusUI}
           <ACLButton
-            access={userHasAccess(~permission=OperationsManage)}
+            access={userHasAccess(~groupACL=OperationsManage)}
             text="+ Refund"
             onClick={_ => {
               openRefundModal()
@@ -591,7 +591,7 @@ let make = (~id, ~profileId) => {
   open OrderUIUtils
   let url = RescriptReactRouter.useUrl()
   let getURL = useGetURL()
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let featureFlagDetails = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
   let showToast = ToastState.useShowToast()
   let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Loading)
@@ -678,7 +678,7 @@ let make = (~id, ~profileId) => {
         </div>
         <RenderIf condition={showSyncButton()}>
           <ACLButton
-            access={userHasAccess(~permission=OperationsView)}
+            access={userHasAccess(~groupACL=OperationsView)}
             text="Sync"
             leftIcon={Button.CustomIcon(
               <Icon
@@ -711,7 +711,7 @@ let make = (~id, ~profileId) => {
         />
         <RenderIf
           condition={featureFlagDetails.auditTrail &&
-          userHasAccess(~permission=AnalyticsView) === Access}>
+          userHasAccess(~groupACL=AnalyticsView) === Access}>
           <RenderAccordian
             initialExpandedArray=[0]
             accordion={[
diff --git a/src/screens/PMAuthenticationProcessor/PMAuthenticationConnectorList.res b/src/screens/PMAuthenticationProcessor/PMAuthenticationConnectorList.res
index ab8718437..ee0272f94 100644
--- a/src/screens/PMAuthenticationProcessor/PMAuthenticationConnectorList.res
+++ b/src/screens/PMAuthenticationProcessor/PMAuthenticationConnectorList.res
@@ -4,7 +4,7 @@ let make = () => {
   let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Success)
   let (configuredConnectors, setConfiguredConnectors) = React.useState(_ => [])
   let (offset, setOffset) = React.useState(_ => 0)
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
   let getConnectorList = async _ => {
     try {
@@ -51,7 +51,7 @@ let make = () => {
             resultsPerPage=20
             entity={PMAuthenticationTableEntity.pmAuthenticationEntity(
               `pm-authentication-processor`,
-              ~permission=userHasAccess(~permission=ConnectorsManage),
+              ~permission=userHasAccess(~groupACL=ConnectorsManage),
             )}
             offset
             setOffset
diff --git a/src/screens/PayoutRouting/PayoutHistoryTable.res b/src/screens/PayoutRouting/PayoutHistoryTable.res
index 485e26bae..08827c715 100644
--- a/src/screens/PayoutRouting/PayoutHistoryTable.res
+++ b/src/screens/PayoutRouting/PayoutHistoryTable.res
@@ -2,7 +2,7 @@ open PayoutHistoryTableEntity
 
 @react.component
 let make = (~records, ~activeRoutingIds: array<string>) => {
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let (offset, setOffset) = React.useState(_ => 0)
 
   <LoadedTable
@@ -11,7 +11,7 @@ let make = (~records, ~activeRoutingIds: array<string>) => {
     actualData=records
     entity={payoutHistoryEntity(
       activeRoutingIds,
-      ~permission=userHasAccess(~permission=WorkflowsManage),
+      ~permission=userHasAccess(~groupACL=WorkflowsManage),
     )}
     resultsPerPage=10
     showSerialNumber=true
diff --git a/src/screens/Processors/ProcessorCards.res b/src/screens/Processors/ProcessorCards.res
index 11d9eea87..b49f8529a 100644
--- a/src/screens/Processors/ProcessorCards.res
+++ b/src/screens/Processors/ProcessorCards.res
@@ -23,11 +23,11 @@ module RequestConnector = {
 module CantFindProcessor = {
   @react.component
   let make = (~showRequestConnectorBtn, ~setShowModal) => {
-    let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
     <RenderIf condition={showRequestConnectorBtn}>
       <ACLButton
-        access={userHasAccess(~permission=MerchantDetailsManage)}
+        access={userHasAccess(~groupACL=MerchantDetailsManage)}
         text="Request a Processor"
         buttonType={Transparent}
         buttonSize={Small}
@@ -57,7 +57,7 @@ let make = (
 ) => {
   open ConnectorUtils
   let mixpanelEvent = MixpanelHook.useSendEvent()
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let featureFlagDetails = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
 
   let unConfiguredConnectors =
@@ -121,7 +121,7 @@ let make = (
           showDummyConnectorButton &&
           urlPrefix == "connectors/new"}>
           <ACLButton
-            access={userHasAccess(~permission=ConnectorsManage)}
+            access={userHasAccess(~groupACL=ConnectorsManage)}
             leftIcon={CustomIcon(
               <Icon
                 name="plus"
@@ -150,7 +150,7 @@ let make = (
             let size = "w-14 h-14 rounded-sm"
 
             <ACLDiv
-              permission={userHasAccess(~permission=ConnectorsManage)}
+              permission={userHasAccess(~groupACL=ConnectorsManage)}
               onClick={_ => ()}
               key={i->string_of_int}
               className="border p-6 gap-4 bg-white rounded flex flex-col justify-between"
@@ -165,7 +165,7 @@ let make = (
                 {connectorInfo.description->React.string}
               </p>
               <ACLButton
-                access={userHasAccess(~permission=ConnectorsManage)}
+                access={userHasAccess(~groupACL=ConnectorsManage)}
                 text="Connect"
                 onClick={_ => handleClick(connectorName)}
                 buttonType={Transparent}
diff --git a/src/screens/Refunds/ShowRefund.res b/src/screens/Refunds/ShowRefund.res
index ed7a2be1e..d5e043065 100644
--- a/src/screens/Refunds/ShowRefund.res
+++ b/src/screens/Refunds/ShowRefund.res
@@ -77,7 +77,7 @@ let make = (~id, ~profileId) => {
   open HSwitchOrderUtils
   let url = RescriptReactRouter.useUrl()
   let getURL = APIUtils.useGetURL()
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let featureFlagDetails = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
   let (screenStateForRefund, setScreenStateForRefund) = React.useState(_ =>
     PageLoaderWrapper.Loading
@@ -158,7 +158,7 @@ let make = (~id, ~profileId) => {
         </div>
         <RenderIf condition={showSyncButton()}>
           <ACLButton
-            access={userHasAccess(~permission=OperationsView)}
+            access={userHasAccess(~groupACL=OperationsView)}
             text="Sync"
             leftIcon={Button.CustomIcon(
               <Icon
@@ -183,7 +183,7 @@ let make = (~id, ~profileId) => {
       <div className="mt-5" />
       <RenderIf
         condition={featureFlagDetails.auditTrail &&
-        userHasAccess(~permission=AnalyticsView) === Access}>
+        userHasAccess(~groupACL=AnalyticsView) === Access}>
         <OrderUIUtils.RenderAccordian
           initialExpandedArray=[0]
           accordion={[
@@ -199,7 +199,7 @@ let make = (~id, ~profileId) => {
           ]}
         />
       </RenderIf>
-      <RenderIf condition={userHasAccess(~permission=OperationsView) === Access}>
+      <RenderIf condition={userHasAccess(~groupACL=OperationsView) === Access}>
         <LoadedTable
           title="Payment"
           actualData=orderData
diff --git a/src/screens/Routing/ActiveRouting.res b/src/screens/Routing/ActiveRouting.res
index 745ebc13c..4046de946 100644
--- a/src/screens/Routing/ActiveRouting.res
+++ b/src/screens/Routing/ActiveRouting.res
@@ -29,7 +29,7 @@ module ActionButtons = {
       ThemeProvider.themeContext,
     )
     let mixpanelEvent = MixpanelHook.useSendEvent()
-    let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
     switch routeType {
     | PRIORITY
@@ -37,7 +37,7 @@ module ActionButtons = {
     | ADVANCED =>
       <ACLButton
         text={"Setup"}
-        access={userHasAccess(~permission=WorkflowsManage)}
+        access={userHasAccess(~groupACL=WorkflowsManage)}
         buttonType=Secondary
         buttonSize={Small}
         customButtonStyle={` !${borderColor.primaryNormal} bg-white ${textColor.primaryNormal}`}
@@ -53,7 +53,7 @@ module ActionButtons = {
     | DEFAULTFALLBACK =>
       <ACLButton
         text={"Manage"}
-        access={userHasAccess(~permission=WorkflowsManage)}
+        access={userHasAccess(~groupACL=WorkflowsManage)}
         buttonType=Secondary
         customButtonStyle={`!${borderColor.primaryNormal} bg-white ${textColor.primaryNormal}`}
         buttonSize={Small}
@@ -78,7 +78,7 @@ module ActiveSection = {
     open LogicUtils
     let activeRoutingType =
       activeRouting->getDictFromJsonObject->getString("kind", "")->routingTypeMapper
-    let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
     let routingName = switch activeRoutingType {
     | DEFAULTFALLBACK => ""
@@ -119,7 +119,7 @@ module ActiveSection = {
         </div>
         <div className="flex gap-5 pt-6 w-1/4">
           <ACLButton
-            access={userHasAccess(~permission=WorkflowsManage)}
+            access={userHasAccess(~groupACL=WorkflowsManage)}
             text="Manage"
             buttonType=Secondary
             customButtonStyle="w-2/3"
diff --git a/src/screens/Routing/History.res b/src/screens/Routing/History.res
index 6059a8466..c9df8e540 100644
--- a/src/screens/Routing/History.res
+++ b/src/screens/Routing/History.res
@@ -2,17 +2,14 @@ open HistoryEntity
 module HistoryTable = {
   @react.component
   let make = (~records, ~activeRoutingIds: array<string>) => {
-    let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
     let (offset, setOffset) = React.useState(_ => 0)
 
     <LoadedTable
       title="History"
       hideTitle=true
       actualData=records
-      entity={historyEntity(
-        activeRoutingIds,
-        ~permission=userHasAccess(~permission=WorkflowsManage),
-      )}
+      entity={historyEntity(activeRoutingIds, ~permission=userHasAccess(~groupACL=WorkflowsManage))}
       resultsPerPage=10
       showSerialNumber=true
       totalResults={records->Array.length}
diff --git a/src/screens/Settings/BusinessDetails.res b/src/screens/Settings/BusinessDetails.res
index a35d827f8..4da97019d 100644
--- a/src/screens/Settings/BusinessDetails.res
+++ b/src/screens/Settings/BusinessDetails.res
@@ -61,7 +61,7 @@ let make = () => {
   let fetchDetails = useGetMethod()
   let updateDetails = useUpdateMethod()
   let showToast = ToastState.useShowToast()
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let featureFlagDetails = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
   let (uid, setUid) = React.useState(() => None)
   let (merchantInfo, setMerchantInfo) = React.useState(() => Dict.make())
@@ -153,7 +153,7 @@ let make = () => {
           {switch formState {
           | Preview =>
             <ACLButton
-              access={userHasAccess(~permission=MerchantDetailsManage)}
+              access={userHasAccess(~groupACL=MerchantDetailsManage)}
               text="Edit"
               onClick={_ => setFormState(_ => Edit)}
               buttonType=Primary
diff --git a/src/screens/Settings/BusinessMapping/BusinessProfile.res b/src/screens/Settings/BusinessMapping/BusinessProfile.res
index a331dc593..0482f7634 100644
--- a/src/screens/Settings/BusinessMapping/BusinessProfile.res
+++ b/src/screens/Settings/BusinessMapping/BusinessProfile.res
@@ -26,7 +26,7 @@ module AddEntryBtn = {
       [
         ("profile_name", `default${list->Array.length->Int.toString}`->JSON.Encode.string),
       ]->Dict.fromArray
-    let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
     let modalBody =
       <div>
         {switch modalState {
@@ -95,7 +95,7 @@ module AddEntryBtn = {
       <RenderIf condition=isFromSettings>
         <ACLButton
           text="Add"
-          access={userHasAccess(~permission=MerchantDetailsManage)}
+          access={userHasAccess(~groupACL=MerchantDetailsManage)}
           buttonSize=Small
           buttonType={Primary}
           onClick={_ => {
diff --git a/src/screens/Settings/HSwitchSettings.res b/src/screens/Settings/HSwitchSettings.res
index 37c3ab6ff..a45ebe2ef 100644
--- a/src/screens/Settings/HSwitchSettings.res
+++ b/src/screens/Settings/HSwitchSettings.res
@@ -26,7 +26,7 @@ module TileComponent = {
     let showPopUp = PopUpState.useShowPopUp()
     let showToast = ToastState.useShowToast()
     let updateDetails = useUpdateMethod()
-    let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
     let deleteSampleData = async () => {
       try {
@@ -79,7 +79,7 @@ module TileComponent = {
       }
     }
     let accessBasedOnCardName = switch cardName {
-    | #DELETE_SAMPLE_DATA => userHasAccess(~permission=OperationsManage)
+    | #DELETE_SAMPLE_DATA => userHasAccess(~groupACL=OperationsManage)
     | _ => Access
     }
 
diff --git a/src/screens/Surcharge/Surcharge.res b/src/screens/Surcharge/Surcharge.res
index 9a7d2c524..7cea89b20 100644
--- a/src/screens/Surcharge/Surcharge.res
+++ b/src/screens/Surcharge/Surcharge.res
@@ -106,7 +106,7 @@ let make = () => {
   let (pageView, setPageView) = React.useState(_ => LANDING)
   let showPopUp = PopUpState.useShowPopUp()
   let (showWarning, setShowWarning) = React.useState(_ => true)
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let mixpanelEvent = MixpanelHook.useSendEvent()
 
   let getWasm = async () => {
@@ -285,7 +285,7 @@ let make = () => {
             </p>
             <ACLButton
               text="Create New"
-              access={userHasAccess(~permission=WorkflowsManage)}
+              access={userHasAccess(~groupACL=WorkflowsManage)}
               buttonType=Primary
               customButtonStyle="!w-1/6 "
               onClick={_ => handleCreateNew()}
diff --git a/src/screens/TaxProcessor/TaxProcessorList.res b/src/screens/TaxProcessor/TaxProcessorList.res
index a2b21cc2d..351280ad9 100644
--- a/src/screens/TaxProcessor/TaxProcessorList.res
+++ b/src/screens/TaxProcessor/TaxProcessorList.res
@@ -4,7 +4,7 @@ let make = () => {
   let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Success)
   let (configuredConnectors, setConfiguredConnectors) = React.useState(_ => [])
   let (offset, setOffset) = React.useState(_ => 0)
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
   let getConnectorList = async _ => {
     try {
@@ -50,7 +50,7 @@ let make = () => {
             resultsPerPage=20
             entity={TaxProcessorTableEntity.taxProcessorEntity(
               `tax-processor`,
-              ~permission=userHasAccess(~permission=ConnectorsManage),
+              ~permission=userHasAccess(~groupACL=ConnectorsManage),
             )}
             offset
             setOffset
diff --git a/src/screens/ThreeDSFlow/HSwitchThreeDS.res b/src/screens/ThreeDSFlow/HSwitchThreeDS.res
index 9c8cb8840..890979250 100644
--- a/src/screens/ThreeDSFlow/HSwitchThreeDS.res
+++ b/src/screens/ThreeDSFlow/HSwitchThreeDS.res
@@ -148,7 +148,7 @@ let make = () => {
   let (pageView, setPageView) = React.useState(_ => NEW)
   let showPopUp = PopUpState.useShowPopUp()
   let (showWarning, setShowWarning) = React.useState(_ => true)
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
   let getWasm = async () => {
     try {
@@ -364,7 +364,7 @@ let make = () => {
             </p>
             <ACLButton
               text="Create New"
-              access={userHasAccess(~permission=WorkflowsManage)}
+              access={userHasAccess(~groupACL=WorkflowsManage)}
               buttonType=Primary
               customButtonStyle="!w-1/6"
               onClick={_ => handleCreateNew()}
diff --git a/src/screens/ThreeDsProcessors/ThreeDsConnectorList.res b/src/screens/ThreeDsProcessors/ThreeDsConnectorList.res
index 7f57ab175..93e30d1c4 100644
--- a/src/screens/ThreeDsProcessors/ThreeDsConnectorList.res
+++ b/src/screens/ThreeDsProcessors/ThreeDsConnectorList.res
@@ -5,7 +5,7 @@ let make = () => {
   let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Success)
   let (configuredConnectors, setConfiguredConnectors) = React.useState(_ => [])
   let (offset, setOffset) = React.useState(_ => 0)
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
   let getConnectorList = async _ => {
     try {
@@ -54,7 +54,7 @@ let make = () => {
             resultsPerPage=20
             entity={ThreeDsTableEntity.threeDsAuthenticatorEntity(
               `3ds-authenticators`,
-              ~permission=userHasAccess(~permission=ConnectorsManage),
+              ~permission=userHasAccess(~groupACL=ConnectorsManage),
             )}
             offset
             setOffset
diff --git a/src/screens/UserManagement/UserRevamp/CreateCustomRole.res b/src/screens/UserManagement/UserRevamp/CreateCustomRole.res
index a7d5faf2b..c794626d5 100644
--- a/src/screens/UserManagement/UserRevamp/CreateCustomRole.res
+++ b/src/screens/UserManagement/UserRevamp/CreateCustomRole.res
@@ -20,7 +20,7 @@ module RenderCustomRoles = {
     }
 
     <RenderIf
-      condition={groupName->PermissionMapper.mapStringToPermissionType !== OrganizationManage}>
+      condition={groupName->GroupACLMapper.mapStringToPermissionType !== OrganizationManage}>
       <div className="flex gap-6 items-start cursor-pointer" onClick={_ => onClickGroup(groupName)}>
         <div className="mt-1">
           <CheckBoxIcon isSelected={checkboxSelected} size={Large} />
diff --git a/src/screens/UserManagement/UserRevamp/ListRoles.res b/src/screens/UserManagement/UserRevamp/ListRoles.res
index b433f7da2..fbb0add9b 100644
--- a/src/screens/UserManagement/UserRevamp/ListRoles.res
+++ b/src/screens/UserManagement/UserRevamp/ListRoles.res
@@ -9,7 +9,7 @@ let make = (~userModuleEntity: UserManagementTypes.userModuleTypes) => {
   let (rolesOffset, setRolesOffset) = React.useState(_ => 0)
   let {checkUserEntity} = React.useContext(UserInfoProvider.defaultContext)
   let mixpanelEvent = MixpanelHook.useSendEvent()
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
 
   let getRolesAvailable = async () => {
     setScreenStateRoles(_ => PageLoaderWrapper.Loading)
@@ -40,7 +40,7 @@ let make = (~userModuleEntity: UserManagementTypes.userModuleTypes) => {
     <PageLoaderWrapper screenState={screenStateRoles}>
       <div className="flex flex-1 justify-end">
         <ACLButton
-          access={userHasAccess(~permission=UsersManage)}
+          access={userHasAccess(~groupACL=UsersManage)}
           text={"Create custom roles"}
           buttonType=Primary
           onClick={_ => {
diff --git a/src/screens/UserManagement/UserRevamp/ListUsers.res b/src/screens/UserManagement/UserRevamp/ListUsers.res
index 2dd1b00f8..50c4e03e7 100644
--- a/src/screens/UserManagement/UserRevamp/ListUsers.res
+++ b/src/screens/UserManagement/UserRevamp/ListUsers.res
@@ -7,7 +7,7 @@ let make = (~userModuleEntity: UserManagementTypes.userModuleTypes) => {
   let getURL = useGetURL()
   let fetchDetails = useGetMethod()
   let mixpanelEvent = MixpanelHook.useSendEvent()
-  let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+  let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
   let (usersData, setUsersData) = React.useState(_ => [])
   let (usersFilterData, setUsersFilterData) = React.useState(_ => [])
   let (screenStateUsers, setScreenStateUsers) = React.useState(_ => PageLoaderWrapper.Loading)
@@ -59,7 +59,7 @@ let make = (~userModuleEntity: UserManagementTypes.userModuleTypes) => {
     <div className="relative mt-5 w-full flex flex-col gap-12">
       <div className="absolute right-0 z-10">
         <ACLButton
-          access={userHasAccess(~permission=UsersManage)}
+          access={userHasAccess(~groupACL=UsersManage)}
           text={"Invite users"}
           buttonType=Primary
           onClick={_ => {
diff --git a/src/screens/UserManagement/UserRevamp/UserInfo.res b/src/screens/UserManagement/UserRevamp/UserInfo.res
index 7d99cb5eb..251b396ad 100644
--- a/src/screens/UserManagement/UserRevamp/UserInfo.res
+++ b/src/screens/UserManagement/UserRevamp/UserInfo.res
@@ -6,7 +6,7 @@ module UserAction = {
     open UserManagementTypes
 
     let url = RescriptReactRouter.useUrl()
-    let {userHasAccess} = PermissionHooks.useUserGroupPermissionsHook()
+    let {userHasAccess} = GroupACLHooks.useUserGroupACLHook()
     let userEmail =
       url.search
       ->LogicUtils.getDictFromUrlSearchParams
@@ -23,7 +23,7 @@ module UserAction = {
       } else if userEmail === email {
         // User cannot update its own role
         NoActionAccess
-      } else if userHasAccess(~permission=UsersManage) === NoAccess {
+      } else if userHasAccess(~groupACL=UsersManage) === NoAccess {
         // User doesn't have user write permission
         NoActionAccess
       } else if (
diff --git a/src/utils/Mappers/PermissionMapper.res b/src/utils/Mappers/GroupACLMapper.res
similarity index 100%
rename from src/utils/Mappers/PermissionMapper.res
rename to src/utils/Mappers/GroupACLMapper.res