diff --git a/gms-ui/src/api/mock/index.js b/gms-ui/src/api/mock/index.js
index fcaf8ea991995841e22e8ac64f48260f658da97b..33bd82d1c17582828e1b4aa1cf06973d8969462e 100644
--- a/gms-ui/src/api/mock/index.js
+++ b/gms-ui/src/api/mock/index.js
@@ -35,7 +35,7 @@ export default {
   addGroup() {
     return fetch(groupsPanel);
   },
-  renameGroup() {
+  updateGroup() {
     return fetch(groupsPanel);
   },
   removeGroup() {
diff --git a/gms-ui/src/api/server/index.js b/gms-ui/src/api/server/index.js
index 61abe1710ca1a2f78bafd0301dbd5cdf407948ee..4006f18ad703965b14e04de30cb28ff2bc36b881 100644
--- a/gms-ui/src/api/server/index.js
+++ b/gms-ui/src/api/server/index.js
@@ -145,7 +145,7 @@ export default {
       })
     });
   },
-  renameGroup(groupId, newGroupName, leaf, input) {
+  updateGroup(groupId, newGroupName, leaf, input) {
     let url = BASE_API_URL + 'group/' + groupId;
     return apiRequest(url, {
       method: 'PUT',
diff --git a/gms-ui/src/components/GroupsPanel.vue b/gms-ui/src/components/GroupsPanel.vue
index f7aea6170aa85a0aefab41bc1c84f7e89b79d239..dfdb7d72b5231478a89d01ead8316a8cdafe2c41 100644
--- a/gms-ui/src/components/GroupsPanel.vue
+++ b/gms-ui/src/components/GroupsPanel.vue
@@ -10,7 +10,7 @@
       <b-list-group-item href="#" v-on:click="openGroup(group)">
         <span class="float-left">{{group.groupName}}</span>
         <span v-if="group.permission === 'ADMIN'" class="float-right">
-          <a href="#" v-on:click.stop="openRenameGroupModal(group)" title="Rename">
+          <a href="#" v-on:click.stop="openEditGroupModal(group)" title="Edit">
             <font-awesome-icon icon="edit"></font-awesome-icon>
           </a>
           &nbsp;
@@ -23,13 +23,13 @@
     <p v-if="model.groupsPanel.items.length === 0">No groups</p>
   </div>
   <Paginator :paginatedPanel="model.groupsPanel" :onUpdate="updatePagination" :paginatorInput="input" />
-  <RenameGroupModal ref="renameGroupModal" />
+  <EditGroupModal ref="editGroupModal" />
   <ConfirmRemoveGroupModal ref="confirmRemoveGroupModal" />
 </b-tab>
 </template>
 
 <script>
-import RenameGroupModal from './modals/RenameGroupModal.vue';
+import EditGroupModal from './modals/EditGroupModal.vue';
 import ConfirmRemoveGroupModal from './modals/ConfirmRemoveGroupModal.vue';
 import Paginator from './Paginator.vue';
 import {
@@ -42,7 +42,7 @@ import debounce from 'debounce'; // for delaying the input event (search filter)
 export default {
   name: 'GroupsPanel',
   components: {
-    RenameGroupModal,
+    EditGroupModal,
     ConfirmRemoveGroupModal,
     Paginator
   },
@@ -54,8 +54,8 @@ export default {
     openGroup: function(group) {
       this.$store.commit('openGroup', group.groupId);
     },
-    openRenameGroupModal: function(group) {
-      this.$refs.renameGroupModal.openRenameGroupModal(group);
+    openEditGroupModal: function(group) {
+      this.$refs.editGroupModal.openEditGroupModal(group);
     },
     openRemoveGroupModal: function(group) {
       this.$refs.confirmRemoveGroupModal.openRemoveGroupModal(group);
diff --git a/gms-ui/src/components/modals/RenameGroupModal.vue b/gms-ui/src/components/modals/EditGroupModal.vue
similarity index 79%
rename from gms-ui/src/components/modals/RenameGroupModal.vue
rename to gms-ui/src/components/modals/EditGroupModal.vue
index 4af4733a4d1ce7ab68af708a13bc8ecd72fa8953..d699c641a088f041d9b6bf66608395cae5c4ca0a 100644
--- a/gms-ui/src/components/modals/RenameGroupModal.vue
+++ b/gms-ui/src/components/modals/EditGroupModal.vue
@@ -1,5 +1,5 @@
 <template>
-<b-modal id="rename-group-modal" title="Rename group" ok-title="Rename" @ok="renameGroup">
+<b-modal id="edit-group-modal" title="Edit group" ok-title="Update" @ok="updateGroup">
   <b-form inline>
     <label class="w-25" for="new-group-name-input">Group name:</label>
     <b-form-input v-model="newGroupName" id="new-group-name-input" class="w-75" aria-describedby="new-group-name-input-feedback" :state="newGroupNameState" v-on:input="resetError">
@@ -14,7 +14,7 @@
 import client from 'api-client';
 
 export default {
-  name: 'RenameGroupModal',
+  name: 'EditGroupModal',
   computed: {
     newGroupNameState() {
       if (this.newGroupNameError) {
@@ -36,13 +36,13 @@ export default {
     resetError: function() {
       this.newGroupNameError = null;
     },
-    openRenameGroupModal: function(group) {
+    openEditGroupModal: function(group) {
       this.newGroupName = group.groupName;
       this.groupId = group.groupId;
       this.leaf = group.leaf;
-      this.$bvModal.show('rename-group-modal');
+      this.$bvModal.show('edit-group-modal');
     },
-    renameGroup: function(event) {
+    updateGroup: function(event) {
       // Prevent modal from closing
       event.preventDefault();
 
@@ -52,17 +52,17 @@ export default {
       }
 
       if (this.oldGroupName === this.newGroupName) {
-        this.$bvModal.hide('rename-group-modal');
+        this.$bvModal.hide('edit-group-modal');
         return;
       }
 
-      client.renameGroup(this.groupId, this.newGroupName, this.leaf, this.$store.state.input)
+      client.updateGroup(this.groupId, this.newGroupName, this.leaf, this.$store.state.input)
         .then(res => {
           if (res.status === 400) {
             this.newGroupNameError = res.message;
           } else {
             this.$store.commit('updateGroupsPanel', res);
-            this.$bvModal.hide('rename-group-modal');
+            this.$bvModal.hide('edit-group-modal');
           }
         });
     }