diff --git a/c_network_security_group.go b/c_network_security_group.go
index b8f5c60..349677d 100644
--- a/c_network_security_group.go
+++ b/c_network_security_group.go
@@ -15,13 +15,13 @@ func (n *NetworkSecurityGroup) Handle(subject string, c component, lines []Messa
 	parts := strings.Split(subject, ".")
 	subject = parts[0] + "." + parts[1]
 	switch subject {
-	case "network_security_group.create":
+	case "security_group.create":
 		lines = n.getSingleDetail(c, "Created Network Security Group")
-	case "network_security_group.update":
+	case "security_group.update":
 		lines = n.getSingleDetail(c, "Updated Network Security Group")
-	case "network_security_group.delete":
+	case "security_group.delete":
 		lines = n.getSingleDetail(c, "Deleted Network Security Group")
-	case "network_security_groups.find":
+	case "security_groups.find":
 		for _, cx := range c.getFoundComponents() {
 			lines = append(lines, n.getSingleDetail(cx, "Found Network Security Group")...)
 		}
diff --git a/generic.go b/generic.go
index da7a4a0..eeecac7 100644
--- a/generic.go
+++ b/generic.go
@@ -130,7 +130,7 @@ func genericHandler(msg *nats.Msg) {
 	case "local_network_gateway", "local_network_gateways":
 		var h LocalNetworkGateway
 		msgLines = h.Handle(msg.Subject, c, msgLines)
-	case "network_security_group", "network_security_groups":
+	case "security_group", "security_groups":
 		var h NetworkSecurityGroup
 		msgLines = h.Handle(msg.Subject, c, msgLines)
 	case "sql_database", "sql_databases":