diff --git a/src/ThingSet.Client/ThingSetClient.cs b/src/ThingSet.Client/ThingSetClient.cs
index 04eb642..85b702b 100644
--- a/src/ThingSet.Client/ThingSetClient.cs
+++ b/src/ThingSet.Client/ThingSetClient.cs
@@ -36,7 +36,7 @@ public class ThingSetClient : IThingSetClient
     {
     }
 
-    public ThingSetClient(IClientTransport transport, ulong? targetNodeId) : this(transport, new DefaultThingSetSchemaProvider(), targetNodeId)
+    public ThingSetClient(IClientTransport transport, ulong? targetEui) : this(transport, new DefaultThingSetSchemaProvider(), targetEui)
     {
     }
 
@@ -44,17 +44,18 @@ public ThingSetClient(IClientTransport transport, IThingSetSchemaProvider schema
     {
     }
 
-    public ThingSetClient(IClientTransport transport, IThingSetSchemaProvider schemaProvider, ulong? targetNodeId)
+    public ThingSetClient(IClientTransport transport, IThingSetSchemaProvider schemaProvider, ulong? targetEui)
     {
         _transport = transport;
         _schemaProvider = schemaProvider;
-        TargetNodeID = targetNodeId;
+        TargetEui = targetEui;
     }
 
     /// <summary>
-    /// The target node if this client is forwarding requests to another node.
+    /// The EUI of the target device if this client is sending requests to a gateway which will
+    /// forward them to another device.
     /// </summary>
-    public ulong? TargetNodeID { get; }
+    public ulong? TargetEui { get; }
 
     /// <summary>
     /// Connects to the ThingSet device.
@@ -166,12 +167,12 @@ public IEnumerable<ThingSetNode> GetNodes(ThingSetNodeEnumerationOptions options
         byte[] buffer = new byte[4095];
         Span<byte> span = buffer;
         int length = 0;
-        if (TargetNodeID.HasValue)
+        if (TargetEui.HasValue)
         {
             // prefix the request with node to forward to
             span[0] = (byte)ThingSetRequest.Forward;
             CborWriter w = new CborWriter(CborConformanceMode.Lax);
-            w.WriteTextString($"{TargetNodeID.Value:x}");
+            w.WriteTextString($"{TargetEui.Value:x}");
             w.Encode(span.Slice(1));
             span = span.Slice(1 + w.BytesWritten);
             length = 1 + w.BytesWritten;
diff --git a/src/ThingSet.Client/ThingSetClientExtensions.cs b/src/ThingSet.Client/ThingSetClientExtensions.cs
index 2aca836..b796452 100644
--- a/src/ThingSet.Client/ThingSetClientExtensions.cs
+++ b/src/ThingSet.Client/ThingSetClientExtensions.cs
@@ -13,7 +13,7 @@ public static class ThingSetClientExtensions
 {
     private const uint NodeID = 0x1d;
 
-    public static bool TryGetNodeId(this IThingSetClient thingSetClient, [NotNullWhen(true)] out ulong? nodeId)
+    public static bool TryGetEui(this IThingSetClient thingSetClient, [NotNullWhen(true)] out ulong? nodeId)
     {
         object? result;
         try
diff --git a/src/ThingSet.Common.Transports.Can/AddressClaimEventArgs.cs b/src/ThingSet.Common.Transports.Can/AddressClaimEventArgs.cs
index 8e1bf86..0feba02 100644
--- a/src/ThingSet.Common.Transports.Can/AddressClaimEventArgs.cs
+++ b/src/ThingSet.Common.Transports.Can/AddressClaimEventArgs.cs
@@ -7,13 +7,13 @@ namespace ThingSet.Common.Transports.Can;
 
 public class AddressClaimEventArgs : AddressEventArgs
 {
-    public AddressClaimEventArgs(byte nodeAddress, byte bridgeId, ulong nodeId)
+    public AddressClaimEventArgs(byte nodeAddress, byte bridgeId, ulong eui)
         : base(nodeAddress)
     {
         BridgeId = bridgeId;
-        NodeId = nodeId;
+        Eui = eui;
     }
 
     public byte BridgeId { get; }
-    public ulong NodeId { get; }
+    public ulong Eui { get; }
 }
\ No newline at end of file
diff --git a/src/ThingSet.Common.Transports.Can/AddressClaimListener.cs b/src/ThingSet.Common.Transports.Can/AddressClaimListener.cs
index e0ab9a5..d5759ad 100644
--- a/src/ThingSet.Common.Transports.Can/AddressClaimListener.cs
+++ b/src/ThingSet.Common.Transports.Can/AddressClaimListener.cs
@@ -82,8 +82,8 @@ private void RunPeerAddressesHandler()
                 {
                     byte bridgeId = CanID.GetBridge(readFrame.CanId);
                     ReadOnlySpan<byte> data = readFrame.Data;
-                    ulong nodeId = BinaryPrimitives.ReadUInt64BigEndian(readFrame.Data);
-                    AddressClaimed?.Invoke(this, new AddressClaimEventArgs(peerId, bridgeId, nodeId));
+                    ulong eui = BinaryPrimitives.ReadUInt64BigEndian(readFrame.Data);
+                    AddressClaimed?.Invoke(this, new AddressClaimEventArgs(peerId, bridgeId, eui));
                 }
             }
         }