diff --git a/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupDatasetSelectedPopup.tsx b/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupSelectedPopup.tsx
similarity index 87%
rename from web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupDatasetSelectedPopup.tsx
rename to web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupSelectedPopup.tsx
index 7ec3aeb0b..e4f41114d 100644
--- a/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupDatasetSelectedPopup.tsx
+++ b/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupSelectedPopup.tsx
@@ -4,7 +4,7 @@ import { BusterListSelectedOptionPopupContainer } from '@/components/ui/list';
 import { useMemoizedFn } from '@/hooks';
 import React from 'react';
 
-export const DatasetGroupDatasetGroupSelectedPopup: React.FC<{
+export const DatasetGroupPermissionGroupSelectedPopup: React.FC<{
   selectedRowKeys: string[];
   onSelectChange: (selectedRowKeys: string[]) => void;
   datasetGroupId: string;
@@ -35,4 +35,4 @@ export const DatasetGroupDatasetGroupSelectedPopup: React.FC<{
   );
 });
 
-DatasetGroupDatasetGroupSelectedPopup.displayName = 'DatasetGroupDatasetGroupSelectedPopup';
+DatasetGroupPermissionGroupSelectedPopup.displayName = 'DatasetGroupPermissionGroupSelectedPopup';
diff --git a/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupDatasetGroupsController.tsx b/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupsController.tsx
similarity index 89%
rename from web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupDatasetGroupsController.tsx
rename to web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupsController.tsx
index 364648322..910e20375 100644
--- a/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupDatasetGroupsController.tsx
+++ b/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupsController.tsx
@@ -11,11 +11,11 @@ import {
 } from '@/components/features/PermissionComponents';
 import React, { useMemo, useState } from 'react';
 import { Button } from '@/components/ui/buttons';
-import { DatasetGroupDatasetGroupsListContainer } from './DatasetGroupDatasetsListContainer';
+import { DatasetGroupPermissionGroupsListContainer } from './DatasetGroupPermissionGroupsListContainer';
 import { useMemoizedFn } from '@/hooks';
 import { Plus } from '@/components/ui/icons';
 
-export const DatasetGroupDatasetGroupsController: React.FC<{
+export const DatasetGroupPermissionGroupsController: React.FC<{
   datasetGroupId: string;
 }> = ({ datasetGroupId }) => {
   const { data } = useGetDatasetGroupPermissionGroups(datasetGroupId);
@@ -50,7 +50,7 @@ export const DatasetGroupDatasetGroupsController: React.FC<{
         handleSearchChange={handleSearchChange}
         searchPlaceholder="Search by dataset group name..."
         searchChildren={NewDatasetGroupButton}>
-        <DatasetGroupDatasetGroupsListContainer
+        <DatasetGroupPermissionGroupsListContainer
           filteredDatasetGroups={filteredItems}
           datasetGroupId={datasetGroupId}
         />
diff --git a/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupDatasetsListContainer.tsx b/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupsListContainer.tsx
similarity index 89%
rename from web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupDatasetsListContainer.tsx
rename to web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupsListContainer.tsx
index 7a6c55965..5e28aabd7 100644
--- a/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupDatasetsListContainer.tsx
+++ b/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupsListContainer.tsx
@@ -16,9 +16,9 @@ import { BusterInfiniteList } from '@/components/ui/list/BusterInfiniteList';
 import { BusterRoutes, createBusterRoute } from '@/routes';
 import { useMemoizedFn } from '@/hooks';
 import React, { useMemo, useState } from 'react';
-import { DatasetGroupDatasetGroupSelectedPopup } from './DatasetGroupDatasetSelectedPopup';
+import { DatasetGroupPermissionGroupSelectedPopup } from './DatasetGroupPermissionGroupSelectedPopup';
 
-export const DatasetGroupDatasetGroupsListContainer: React.FC<{
+export const DatasetGroupPermissionGroupsListContainer: React.FC<{
   filteredDatasetGroups: GetDatasetGroupPermissionGroupsResponse[];
   datasetGroupId: string;
 }> = React.memo(({ filteredDatasetGroups, datasetGroupId }) => {
@@ -72,8 +72,8 @@ export const DatasetGroupDatasetGroupsListContainer: React.FC<{
           id: datasetGroup.id,
           data: datasetGroup,
           link: createBusterRoute({
-            route: BusterRoutes.SETTINGS_DATASET_GROUPS_ID_DATASETS,
-            datasetGroupId: datasetGroup.id
+            route: BusterRoutes.SETTINGS_PERMISSION_GROUPS_ID_DATASETS,
+            permissionGroupId: datasetGroup.id
           })
         };
         if (datasetGroup.assigned) {
@@ -120,7 +120,7 @@ export const DatasetGroupDatasetGroupsListContainer: React.FC<{
   return (
     <InfiniteListContainer
       popupNode={
-        <DatasetGroupDatasetGroupSelectedPopup
+        <DatasetGroupPermissionGroupSelectedPopup
           selectedRowKeys={selectedRowKeys}
           onSelectChange={setSelectedRowKeys}
           datasetGroupId={datasetGroupId}
@@ -136,7 +136,7 @@ export const DatasetGroupDatasetGroupsListContainer: React.FC<{
         onSelectChange={setSelectedRowKeys}
         emptyState={useMemo(
           () => (
-            <EmptyStateList text="No dataset groups found" />
+            <EmptyStateList text="No permission groups found" />
           ),
           []
         )}
@@ -145,4 +145,4 @@ export const DatasetGroupDatasetGroupsListContainer: React.FC<{
   );
 });
 
-DatasetGroupDatasetGroupsListContainer.displayName = 'DatasetGroupDatasetGroupsListContainer';
+DatasetGroupPermissionGroupSelectedPopup.displayName = 'DatasetGroupPermissionGroupSelectedPopup';
diff --git a/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/page.tsx b/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/page.tsx
index 10e52ff93..9ea6c2bff 100644
--- a/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/page.tsx
+++ b/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/page.tsx
@@ -1,23 +1,17 @@
 import { prefetchDatasetGroupPermissionGroups } from '@/api/buster_rest';
 import { HydrationBoundary, dehydrate } from '@tanstack/react-query';
-import { DatasetGroupDatasetGroupsController } from './DatasetGroupDatasetGroupsController';
+import { DatasetGroupPermissionGroupsController } from './DatasetGroupPermissionGroupsController';
 
-export default async function Page(
-  props: {
-    params: Promise<{ datasetGroupId: string }>;
-  }
-) {
+export default async function Page(props: { params: Promise<{ datasetGroupId: string }> }) {
   const params = await props.params;
 
-  const {
-    datasetGroupId
-  } = params;
+  const { datasetGroupId } = params;
 
   const queryClient = await prefetchDatasetGroupPermissionGroups(datasetGroupId);
 
   return (
     <HydrationBoundary state={dehydrate(queryClient)}>
-      <DatasetGroupDatasetGroupsController datasetGroupId={datasetGroupId} />
+      <DatasetGroupPermissionGroupsController datasetGroupId={datasetGroupId} />
     </HydrationBoundary>
   );
 }
diff --git a/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetGroupsController.tsx b/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetGroupsController.tsx
index bdae754a5..efa705b0f 100644
--- a/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetGroupsController.tsx
+++ b/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetGroupsController.tsx
@@ -45,7 +45,7 @@ export const PermissionGroupDatasetGroupsController: React.FC<{
       <PermissionSearchAndListWrapper
         searchText={searchText}
         handleSearchChange={handleSearchChange}
-        searchPlaceholder="Search by dataset group name..."
+        searchPlaceholder="Search by permission group name..."
         searchChildren={NewDatasetGroupButton}>
         <PermissionGroupDatasetGroupsListContainer
           filteredDatasetGroups={filteredItems}
diff --git a/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetsListContainer.tsx b/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetsListContainer.tsx
index afe3a78bc..2b44e2413 100644
--- a/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetsListContainer.tsx
+++ b/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetsListContainer.tsx
@@ -62,19 +62,19 @@ export const PermissionGroupDatasetGroupsListContainer: React.FC<{
       cannotQueryPermissionDatasetGroups: BusterListRowItem[];
       canQueryPermissionDatasetGroups: BusterListRowItem[];
     }>(
-      (acc, datasetGroup) => {
-        const datasetGroupItem: BusterListRowItem = {
-          id: datasetGroup.id,
-          data: datasetGroup,
+      (acc, permissionGroupDatasetGroup) => {
+        const permissionGroupDatasetGroupItem: BusterListRowItem = {
+          id: permissionGroupDatasetGroup.id,
+          data: permissionGroupDatasetGroup,
           link: createBusterRoute({
-            route: BusterRoutes.SETTINGS_DATASET_GROUPS_ID_DATASETS,
-            datasetGroupId: datasetGroup.id
+            route: BusterRoutes.SETTINGS_PERMISSION_GROUPS_ID_USERS,
+            permissionGroupId: permissionGroupId
           })
         };
-        if (datasetGroup.assigned) {
-          acc.canQueryPermissionDatasetGroups.push(datasetGroupItem);
+        if (permissionGroupDatasetGroup.assigned) {
+          acc.canQueryPermissionDatasetGroups.push(permissionGroupDatasetGroupItem);
         } else {
-          acc.cannotQueryPermissionDatasetGroups.push(datasetGroupItem);
+          acc.cannotQueryPermissionDatasetGroups.push(permissionGroupDatasetGroupItem);
         }
         return acc;
       },