diff --git a/platypush/backend/http/webapp/src/components/panels/Entities/Selector.vue b/platypush/backend/http/webapp/src/components/panels/Entities/Selector.vue
index d8abd90b4..ee627cb03 100644
--- a/platypush/backend/http/webapp/src/components/panels/Entities/Selector.vue
+++ b/platypush/backend/http/webapp/src/components/panels/Entities/Selector.vue
@@ -98,7 +98,15 @@ export default {
 
   methods: {
     prettifyGroupingName(name) {
-      return name ? this.prettify(name) + 's' : ''
+      if (!name)
+        return ''
+
+      name = this.prettify(name)
+      if (name.endsWith('y'))
+        name = name.slice(0, name.length-1) + 'ie'
+
+      name += 's'
+      return name
     },
 
     iconForGroup(group) {