diff --git a/lib/jnpr/junos/factory/cfgtable.py b/lib/jnpr/junos/factory/cfgtable.py
index 036702f9d..67314bc27 100644
--- a/lib/jnpr/junos/factory/cfgtable.py
+++ b/lib/jnpr/junos/factory/cfgtable.py
@@ -336,7 +336,7 @@ def _encode_namekey(self, get_cmd, dot, namekey_value):
         encodes the specific namekey_value into the get command so that the
         returned XML configuration is the complete hierarchy of data.
         """
-        namekey_xpath = self._data_dict.get("key", "name")
+        namekey_xpath = self._data_dict.get("key-field") or "name"
         keylist_xml = self._grindkey(namekey_xpath, namekey_value)
         for _add in keylist_xml:
             dot.append(_add)