diff --git a/internal/discoverer/discoverer_test.go b/internal/discoverer/discoverer_test.go
index 8f49d9f..9c59daa 100644
--- a/internal/discoverer/discoverer_test.go
+++ b/internal/discoverer/discoverer_test.go
@@ -13,25 +13,25 @@ import (
 )
 
 var (
-	dz = &ocmd.DiscoveryZone{
+	dz = &ocmd.DiscoverZone{
 		ExcludePatterns: []string{},
 	}
 	z = &ocmd.Zone{
 		Network: "192.168.1.0/24",
-		IP:      "192.168.1.101",
+		IPV4:    "192.168.1.101",
 		Iface:   "enp3s0",
 		Mac:     "44:8a:5b:f1:f1:f3",
 	}
-	dh = &ocmd.DiscoveryHost{
-		FirstScanRange: "192.168.1.1",
-		LastScanRange:  "192.168.1.254",
+	dh = &ocmd.DiscoverHost{
+		FirstScanRangeV4: "192.168.1.1",
+		LastScanRangeV4:  "192.168.1.254",
 	}
 	h = &ocmd.Host{
 		Zone: z,
-		IP:   "192.168.1.10",
+		IPV4: "192.168.1.10",
 		Mac:  "d0:50:99:97:5d:99",
 	}
-	dp = &ocmd.DiscoveryPort{
+	dp = &ocmd.DiscoverPort{
 		FirstScanRange: 1,
 		LastScanRange:  50000,
 		ExcludePorts: []int{
@@ -45,50 +45,50 @@ var (
 		PortType:   occc.PortTypeTCP,
 		PortNumber: json.Number(strconv.Itoa(80)),
 	}
-	ds = &ocmd.DiscoveryService{
+	ds = &ocmd.DiscoverService{
 		IncludeServices: []string{
-			"ACTIVEDIRECTORY",
-			"CASSANDRA",
-			"DHCP",
-			"DNS",
+			// "ACTIVEDIRECTORY",
+			// "CASSANDRA",
+			// "DHCP",
+			// "DNS",
 			"FTP",
-			"HTTP",
-			"IMAP",
-			"LDAP",
-			"MONGODB",
-			"MSSQL",
-			"MYSQL",
-			"NETBIOS",
-			"ORACLE",
-			"POP",
-			"POSTGRESQL",
-			"REDIS",
-			"RMI",
-			"SMB",
-			"SMTP",
-			"SNMP",
-			"SSH",
-			"TELNET",
-			"WMI",
-			"UNKNOWN",
-			"SSH",
-			"WMI",
-			"SNMP",
+			// "HTTP",
+			// "IMAP",
+			// "LDAP",
+			// "MONGODB",
+			// "MSSQL",
+			// "MYSQL",
+			// "NETBIOS",
+			// "ORACLE",
+			// "POP",
+			// "POSTGRESQL",
+			// "REDIS",
+			// "RMI",
+			// "SMB",
+			// "SMTP",
+			// "SNMP",
+			// "SSH",
+			// "TELNET",
+			// "WMI",
+			// "UNKNOWN",
+			// "SSH",
+			// "WMI",
+			// "SNMP",
 		},
 	}
 
-	dha = &ocmd.DiscoveryHost{
-		FirstScanRange: "192.168.1.1",
-		LastScanRange:  "192.168.1.254",
-		DiscoveryPort: &ocmd.DiscoveryPort{
+	dha = &ocmd.DiscoverHost{
+		FirstScanRangeV4: "192.168.1.1",
+		LastScanRangeV4:  "192.168.1.254",
+		DiscoverPort: &ocmd.DiscoverPort{
 			FirstScanRange: 1,
 			LastScanRange:  50000,
 			ExcludePorts: []int{
 				631,
 			},
-			IncludeTCP:       true,
-			IncludeUDP:       false,
-			DiscoveryService: ds,
+			IncludeTCP:      true,
+			IncludeUDP:      false,
+			DiscoverService: ds,
 		},
 	}
 )