diff --git a/AMWD.Protocols.Modbus.Common/AMWD.Protocols.Modbus.Common.csproj b/AMWD.Protocols.Modbus.Common/AMWD.Protocols.Modbus.Common.csproj
index d6a5e75..6aa06d0 100644
--- a/AMWD.Protocols.Modbus.Common/AMWD.Protocols.Modbus.Common.csproj
+++ b/AMWD.Protocols.Modbus.Common/AMWD.Protocols.Modbus.Common.csproj
@@ -4,11 +4,13 @@
     <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
     <LangVersion>12.0</LangVersion>
 
+    <PackageId>AMWD.Protocols.Modbus.Common</PackageId>
     <AssemblyName>amwd-modbus-common</AssemblyName>
     <RootNamespace>AMWD.Protocols.Modbus.Common</RootNamespace>
 
     <Product>Modbus Protocol Common</Product>
     <Description>Common data for Modbus protocol.</Description>
+    <PackageTags>Modbus Protocol</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/AMWD.Protocols.Modbus.Serial/AMWD.Protocols.Modbus.Serial.csproj b/AMWD.Protocols.Modbus.Serial/AMWD.Protocols.Modbus.Serial.csproj
index 9dceb47..55bd208 100644
--- a/AMWD.Protocols.Modbus.Serial/AMWD.Protocols.Modbus.Serial.csproj
+++ b/AMWD.Protocols.Modbus.Serial/AMWD.Protocols.Modbus.Serial.csproj
@@ -4,11 +4,13 @@
     <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
     <LangVersion>12.0</LangVersion>
 
+    <PackageId>AMWD.Protocols.Modbus.Serial</PackageId>
     <AssemblyName>amwd-modbus-serial</AssemblyName>
     <RootNamespace>AMWD.Protocols.Modbus.Serial</RootNamespace>
 
     <Product>Modbus RTU/ASCII Protocol</Product>
     <Description>Implementation of the Modbus protocol communicating via serial line using RTU or ASCII encoding.</Description>
+    <PackageTags>Modbus Protocol Serial Line RTU ASCII COM TTY</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/AMWD.Protocols.Modbus.Tcp/AMWD.Protocols.Modbus.Tcp.csproj b/AMWD.Protocols.Modbus.Tcp/AMWD.Protocols.Modbus.Tcp.csproj
index 7060266..e8b7175 100644
--- a/AMWD.Protocols.Modbus.Tcp/AMWD.Protocols.Modbus.Tcp.csproj
+++ b/AMWD.Protocols.Modbus.Tcp/AMWD.Protocols.Modbus.Tcp.csproj
@@ -4,11 +4,13 @@
     <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
     <LangVersion>12.0</LangVersion>
 
+    <PackageId>AMWD.Protocols.Modbus.Tcp</PackageId>
     <AssemblyName>amwd-modbus-tcp</AssemblyName>
     <RootNamespace>AMWD.Protocols.Modbus.Tcp</RootNamespace>
 
     <Product>Modbus TCP Protocol</Product>
     <Description>Implementation of the Modbus protocol communicating via TCP.</Description>
+    <PackageTags>Modbus Protocol Network TCP LAN</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/AMWD.Protocols.Modbus.Tests/Tcp/Utils/ModbusTcpConnectionTest.cs b/AMWD.Protocols.Modbus.Tests/Tcp/Utils/ModbusTcpConnectionTest.cs
index 22cf557..4736944 100644
--- a/AMWD.Protocols.Modbus.Tests/Tcp/Utils/ModbusTcpConnectionTest.cs
+++ b/AMWD.Protocols.Modbus.Tests/Tcp/Utils/ModbusTcpConnectionTest.cs
@@ -56,6 +56,7 @@ namespace AMWD.Protocols.Modbus.Tests.Tcp.Utils
 			connection.WriteTimeout = TimeSpan.FromSeconds(456);
 
 			// Assert - part 1
+			Assert.AreEqual("TCP", connection.Name);
 			Assert.AreEqual(1, connection.ReadTimeout.TotalSeconds);
 			Assert.AreEqual(1, connection.WriteTimeout.TotalSeconds);
 			Assert.IsTrue(connection.IsConnected);