diff --git a/hyperglass/command/construct.py b/hyperglass/command/construct.py
index f067dc6..f8f7e56 100644
--- a/hyperglass/command/construct.py
+++ b/hyperglass/command/construct.py
@@ -94,7 +94,6 @@ class Construct:
                 json.dumps(
                     {
                         "query_type": "ping",
-                        "afi": afi.afi_name,
                         "vrf": afi.vrf_name,
                         "source": afi.source_address,
                         "target": self.query_target,
@@ -109,7 +108,6 @@ class Construct:
                     target=self.query_target,
                     source=afi.source_address,
                     vrf=afi.vrf_name,
-                    afi=afi.afi_name,
                 )
             )
 
@@ -136,7 +134,6 @@ class Construct:
                 json.dumps(
                     {
                         "query_type": "traceroute",
-                        "afi": afi.afi_name,
                         "vrf": afi.vrf_name,
                         "source": afi.source_address,
                         "target": self.query_target,
@@ -151,7 +148,6 @@ class Construct:
                     target=self.query_target,
                     source=afi.source_address,
                     vrf=afi.vrf_name,
-                    afi=afi.afi_name,
                 )
             )
 
@@ -175,7 +171,6 @@ class Construct:
                 json.dumps(
                     {
                         "query_type": "bgp_route",
-                        "afi": afi.afi_name,
                         "vrf": afi.vrf_name,
                         "source": afi.source_address,
                         "target": self.query_target,
@@ -190,7 +185,6 @@ class Construct:
                     target=self.format_target(self.query_target),
                     source=afi.source_address,
                     vrf=afi.vrf_name,
-                    afi=afi.afi_name,
                 )
             )
 
@@ -225,7 +219,6 @@ class Construct:
                     json.dumps(
                         {
                             "query_type": "bgp_community",
-                            "afi": afi_attr.afi_name,
                             "vrf": afi_attr.vrf_name,
                             "source": afi_attr.source_address,
                             "target": self.query_target,
@@ -242,7 +235,6 @@ class Construct:
                         target=self.query_target,
                         source=afi_attr.source_address,
                         vrf=afi_attr.vrf_name,
-                        afi=afi_attr.afi_name,
                     )
                 )
 
@@ -276,7 +268,6 @@ class Construct:
                     json.dumps(
                         {
                             "query_type": "bgp_aspath",
-                            "afi": afi_attr.afi_name,
                             "vrf": afi_attr.vrf_name,
                             "source": afi_attr.source_address,
                             "target": self.query_target,
@@ -291,7 +282,6 @@ class Construct:
                         target=self.query_target,
                         source=afi_attr.source_address,
                         vrf=afi_attr.vrf_name,
-                        afi=afi_attr.afi_name,
                     )
                 )
 
diff --git a/hyperglass/configuration/models/commands.py b/hyperglass/configuration/models/commands.py
index 93c7037..bb8ffb1 100644
--- a/hyperglass/configuration/models/commands.py
+++ b/hyperglass/configuration/models/commands.py
@@ -111,7 +111,7 @@ class Commands(HyperglassModel):
             bgp_community: str = "show bgp ipv6 unicast community {target}"
             bgp_aspath: str = 'show bgp ipv6 unicast quote-regexp "{target}"'
             bgp_route: str = "show bgp ipv6 unicast {target} | exclude pathid:|Epoch"
-            ping: str = ("ping {afi} {target} repeat 5 source {source}")
+            ping: str = ("ping ipv6 {target} repeat 5 source {source}")
             traceroute: str = (
                 "traceroute ipv6 {target} timeout 1 probe 2 source {source}"
             )
diff --git a/hyperglass/configuration/models/vrfs.py b/hyperglass/configuration/models/vrfs.py
index bd41b39..a7d9023 100644
--- a/hyperglass/configuration/models/vrfs.py
+++ b/hyperglass/configuration/models/vrfs.py
@@ -27,7 +27,6 @@ from hyperglass.exceptions import ConfigError
 class DeviceVrf4(HyperglassModel):
     """Model for AFI definitions"""
 
-    afi_name: str = "ipv4"
     vrf_name: str
     source_address: IPv4Address
 
@@ -49,7 +48,6 @@ class DeviceVrf4(HyperglassModel):
 class DeviceVrf6(HyperglassModel):
     """Model for AFI definitions"""
 
-    afi_name: str = "ipv6"
     vrf_name: str
     source_address: IPv6Address
 
@@ -102,12 +100,10 @@ class DefaultVrf(HyperglassModel):
     access_list = [{"allow": IPv4Network("0.0.0.0/0")}, {"allow": IPv6Network("::/0")}]
 
     class DefaultVrf4(HyperglassModel):
-        afi_name: str = "ipv4"
         vrf_name: str = "default"
         source_address: IPv4Address = IPv4Address("127.0.0.1")
 
     class DefaultVrf6(HyperglassModel):
-        afi_name: str = "ipv4"
         vrf_name: str = "default"
         source_address: IPv6Address = IPv6Address("::1")