diff --git a/src/app/services/built-in-templates-configuration.service.ts b/src/app/services/built-in-templates-configuration.service.ts
index 0d4d16d1..c1526a4a 100644
--- a/src/app/services/built-in-templates-configuration.service.ts
+++ b/src/app/services/built-in-templates-configuration.service.ts
@@ -6,8 +6,8 @@ export class BuiltInTemplatesConfigurationService {
         let categories = [["Default", "guest"],
             ["Routers", "router"],
             ["Switches", "switch"],
-            ["End devices", "end_device"],
-            ["Security devices", "security_device"]];
+            ["End devices", "guest"],
+            ["Security devices", "firewall"]];
 
         return categories;
     }
@@ -20,8 +20,8 @@ export class BuiltInTemplatesConfigurationService {
         let categories = [["Default", "guest"],
             ["Routers", "router"],
             ["Switches", "switch"],
-            ["End devices", "end_device"],
-            ["Security devices", "security_device"]];
+            ["End devices", "guest"],
+            ["Security devices", "firewall"]];
 
         return categories;
     }
@@ -30,8 +30,8 @@ export class BuiltInTemplatesConfigurationService {
         let categories = [["Default", "guest"],
             ["Routers", "router"],
             ["Switches", "switch"],
-            ["End devices", "end_device"],
-            ["Security devices", "security_device"]];
+            ["End devices", "guest"],
+            ["Security devices", "firewall"]];
 
         return categories;
     }
diff --git a/src/app/services/docker-configuration.service.ts b/src/app/services/docker-configuration.service.ts
index a3f75967..d80a51d2 100644
--- a/src/app/services/docker-configuration.service.ts
+++ b/src/app/services/docker-configuration.service.ts
@@ -10,8 +10,8 @@ export class DockerConfigurationService {
         let categories = [["Default", "guest"],
             ["Routers", "router"],
             ["Switches", "switch"],
-            ["End devices", "end_device"],
-            ["Security devices", "security_device"]];
+            ["End devices", "guest"],
+            ["Security devices", "firewall"]];
 
         return categories;
     }
diff --git a/src/app/services/iou-configuration.service.ts b/src/app/services/iou-configuration.service.ts
index 5d5591dd..80cbabc8 100644
--- a/src/app/services/iou-configuration.service.ts
+++ b/src/app/services/iou-configuration.service.ts
@@ -10,8 +10,8 @@ export class IouConfigurationService {
         let categories = [["Default", "guest"],
             ["Routers", "router"],
             ["Switches", "switch"],
-            ["End devices", "end_device"],
-            ["Security devices", "security_device"]];
+            ["End devices", "guest"],
+            ["Security devices", "firewall"]];
 
         return categories;
     }
diff --git a/src/app/services/qemu-configuration.service.ts b/src/app/services/qemu-configuration.service.ts
index 8d81a1e7..c9fedcf8 100644
--- a/src/app/services/qemu-configuration.service.ts
+++ b/src/app/services/qemu-configuration.service.ts
@@ -84,8 +84,8 @@ export class QemuConfigurationService {
         let categories = [["Default", "guest"],
             ["Routers", "router"],
             ["Switches", "switch"],
-            ["End devices", "end_device"],
-            ["Security devices", "security_device"]];
+            ["End devices", "guest"],
+            ["Security devices", "firewall"]];
 
         return categories;
     }
diff --git a/src/app/services/virtual-box-configuration.service.ts b/src/app/services/virtual-box-configuration.service.ts
index ae29a4ad..59e1157f 100644
--- a/src/app/services/virtual-box-configuration.service.ts
+++ b/src/app/services/virtual-box-configuration.service.ts
@@ -18,8 +18,8 @@ export class VirtualBoxConfigurationService{
         let categories = [["Default", "guest"],
             ["Routers", "router"],
             ["Switches", "switch"],
-            ["End devices", "end_device"],
-            ["Security devices", "security_device"]];
+            ["End devices", "guest"],
+            ["Security devices", "firewall"]];
 
         return categories;
     }
diff --git a/src/app/services/vmware-configuration.service.ts b/src/app/services/vmware-configuration.service.ts
index 1eeada48..7f9fa6eb 100644
--- a/src/app/services/vmware-configuration.service.ts
+++ b/src/app/services/vmware-configuration.service.ts
@@ -18,8 +18,8 @@ export class VmwareConfigurationService{
         let categories = [["Default", "guest"],
             ["Routers", "router"],
             ["Switches", "switch"],
-            ["End devices", "end_device"],
-            ["Security devices", "security_device"]];
+            ["End devices", "guest"],
+            ["Security devices", "firewall"]];
 
         return categories;
     }
diff --git a/src/app/services/vpcs-configuration.service.ts b/src/app/services/vpcs-configuration.service.ts
index c465dd37..2216013a 100644
--- a/src/app/services/vpcs-configuration.service.ts
+++ b/src/app/services/vpcs-configuration.service.ts
@@ -10,8 +10,8 @@ export class VpcsConfigurationService {
         let categories = [["Default", "guest"],
             ["Routers", "router"],
             ["Switches", "switch"],
-            ["End devices", "end_device"],
-            ["Security devices", "security_device"]];
+            ["End devices", "guest"],
+            ["Security devices", "firewall"]];
 
         return categories;
     }