diff --git a/react/src/component/Dashboard.jsx b/react/src/component/Dashboard.jsx
index 3af9ccc66..45eb8a914 100644
--- a/react/src/component/Dashboard.jsx
+++ b/react/src/component/Dashboard.jsx
@@ -14,7 +14,7 @@ import Tooltip from "@mui/material/Tooltip";
 import Grid from '@material-ui/core/Grid';
 import Paper from '@material-ui/core/Paper';
 import DeviceAgentsView from '@/component/DeviceAgentsView'
-import GroupManageView from '@/component/GroupManageView'
+import DeviceGroupView from '@/component/DeviceGroupView'
 import SearchView from '@/component/SearchView'
 import RunnerView from '@/component/RunnerView'
 import TestTaskView from '@/component/TasksView'
@@ -194,9 +194,9 @@ export default function Dashboard() {
                             </ListItem>
                             <ListItem component={Link} to={'/manage'} button>
                                 <ListItemIcon>
-                                    <span className="material-icons-outlined">groups</span>
+                                    <span className="material-icons-outlined">table_view</span>
                                 </ListItemIcon>
-                                <ListItemText primary="Group Management"/>
+                                <ListItemText primary="Device Group"/>
                             </ListItem>
                             <ListItem component={Link} to={'/tasks'} button>
                                 <ListItemIcon>
@@ -290,7 +290,7 @@ export default function Dashboard() {
                                                 <DeviceAgentsView/>
                                             </Route>
                                             <Route exact path="/manage">
-                                                <GroupManageView/>
+                                                <DeviceGroupView/>
                                             </Route>
                                             <Route path="/runner">
                                                 <RunnerView theme={theme}/>
diff --git a/react/src/component/GroupManageView.jsx b/react/src/component/DeviceGroupView.jsx
similarity index 99%
rename from react/src/component/GroupManageView.jsx
rename to react/src/component/DeviceGroupView.jsx
index 0bca09be7..b0a8fefff 100644
--- a/react/src/component/GroupManageView.jsx
+++ b/react/src/component/DeviceGroupView.jsx
@@ -52,7 +52,7 @@ const StyledTableRow = withStyles((theme) => ({
     },
 }))(TableRow);
 
-export default class GroupManageView extends BaseView {
+export default class DeviceGroupView extends BaseView {
 
     state = {
         hideSkeleton: true,
@@ -174,7 +174,7 @@ export default class GroupManageView extends BaseView {
                             <TableRow>
                                 <TableCell colSpan="4">
                                     <Typography variant="h4" className="mt-2 mb-2">
-                                        Group Management</Typography>
+                                        Device Group</Typography>
                                 </TableCell>
                                 <TableCell colSpan="2">
                                     <Stack direction="row" spacing={2}
@@ -271,7 +271,7 @@ export default class GroupManageView extends BaseView {
             <Dialog open={deviceList !== null}
                     fullWidth={true}
                     onClose={() => this.handleStatus("deviceList", null)}>
-                <DialogTitle>Group management
+                <DialogTitle>Device Group
                     <Stack direction="row" spacing={2}
                            justifyContent="flex-end">
                         <Button onClick={() => {