diff --git a/SNMPClient.cs b/SNMPEngine.cs
similarity index 98%
rename from SNMPClient.cs
rename to SNMPEngine.cs
index 59ec3c3..59efe33 100644
--- a/SNMPClient.cs
+++ b/SNMPEngine.cs
@@ -16,7 +16,7 @@ using System.Threading;
 
 namespace ln.snmp
 {
-    public class SNMPClient : IDisposable
+    public class SNMPEngine : IDisposable
     {
         public static bool DEBUG = false;
 
@@ -27,7 +27,7 @@ namespace ln.snmp
         private bool shutdown = false;
         private Thread ReceiverThread { get; set; }
 
-        public SNMPClient(IPEndPoint localEndpoint)
+        public SNMPEngine(IPEndPoint localEndpoint)
         {
             LocalEndpoint = new UdpClient(localEndpoint);
             ReceiverThread = new Thread(Receiver);
diff --git a/channel/SnmpPDUChannel.cs b/channel/SnmpPDUChannel.cs
index 119485c..f4a1857 100644
--- a/channel/SnmpPDUChannel.cs
+++ b/channel/SnmpPDUChannel.cs
@@ -5,12 +5,12 @@ namespace ln.snmp.channel
 {
     public abstract class SnmpPDUChannel
     {
-        public SNMPClient SNMPClient { get; set; }
+        public SNMPEngine SNMPClient { get; set; }
 
 
         public abstract SnmpVersion SnmpVersion { get; }
 
-        public SnmpPDUChannel(SNMPClient client)
+        public SnmpPDUChannel(SNMPEngine client)
         {
             SNMPClient = client;
         }
diff --git a/channel/SnmpV1Channel.cs b/channel/SnmpV1Channel.cs
index cf9cd4d..add5686 100644
--- a/channel/SnmpV1Channel.cs
+++ b/channel/SnmpV1Channel.cs
@@ -12,12 +12,12 @@ namespace ln.snmp.channel
         public OctetString CommunityString { get; set; }
 
 
-        public SnmpV1Channel(SNMPClient client)
+        public SnmpV1Channel(SNMPEngine client)
             :base(client)
         {
             CommunityString = "public";
         }
-        public SnmpV1Channel(SNMPClient client,string communityString)
+        public SnmpV1Channel(SNMPEngine client,string communityString)
             :base(client)
         {
             CommunityString = communityString;
diff --git a/channel/SnmpV2Channel.cs b/channel/SnmpV2Channel.cs
index ad1dcb7..1eae9f1 100644
--- a/channel/SnmpV2Channel.cs
+++ b/channel/SnmpV2Channel.cs
@@ -5,11 +5,11 @@ namespace ln.snmp.channel
     {
         public override SnmpVersion SnmpVersion => SnmpVersion.V2c;
 
-        public SnmpV2Channel(SNMPClient client)
+        public SnmpV2Channel(SNMPEngine client)
             : base(client)
         {
         }
-        public SnmpV2Channel(SNMPClient client, string communityString)
+        public SnmpV2Channel(SNMPEngine client, string communityString)
         : base(client, communityString)
         { }
 
diff --git a/ln.snmp.csproj b/ln.snmp.csproj
index ace5cbf..60f3140 100644
--- a/ln.snmp.csproj
+++ b/ln.snmp.csproj
@@ -34,7 +34,7 @@
     <Reference Include="System.Configuration" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="SNMPClient.cs" />
+    <Compile Include="SNMPEngine.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="types\Variable.cs" />
     <Compile Include="BasicEncodingRules.cs" />