diff --git a/platypush/backend/http/webapp/src/components/panels/Entities/EntityMixin.vue b/platypush/backend/http/webapp/src/components/panels/Entities/EntityMixin.vue
index 74198d29..4ee33e50 100644
--- a/platypush/backend/http/webapp/src/components/panels/Entities/EntityMixin.vue
+++ b/platypush/backend/http/webapp/src/components/panels/Entities/EntityMixin.vue
@@ -31,7 +31,8 @@ export default {
   computed: {
     type() {
       let entityType = (this.value.type || '')
-      return entityType.charAt(0).toUpperCase() + entityType.slice(1)
+      return entityType.split('_').
+        map((s) => s.charAt(0).toUpperCase() + s.slice(1)).join('')
     },
   },
 }