diff --git a/OBD.NET/ODB.NET.ConsoleClient/App.config b/OBD.NET/OBD.NET.ConsoleClient/App.config
similarity index 100%
rename from OBD.NET/ODB.NET.ConsoleClient/App.config
rename to OBD.NET/OBD.NET.ConsoleClient/App.config
diff --git a/OBD.NET/ODB.NET.ConsoleClient/ODB.NET.ConsoleClient.csproj b/OBD.NET/OBD.NET.ConsoleClient/OBD.NET.ConsoleClient.csproj
similarity index 96%
rename from OBD.NET/ODB.NET.ConsoleClient/ODB.NET.ConsoleClient.csproj
rename to OBD.NET/OBD.NET.ConsoleClient/OBD.NET.ConsoleClient.csproj
index a8ae99f..6c8adc4 100644
--- a/OBD.NET/ODB.NET.ConsoleClient/ODB.NET.ConsoleClient.csproj
+++ b/OBD.NET/OBD.NET.ConsoleClient/OBD.NET.ConsoleClient.csproj
@@ -54,9 +54,9 @@
       <Project>{D985B70E-CDF3-4CF1-AB5D-8D19C7FE7B31}</Project>
       <Name>OBD.NET.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\ODB.NET.Desktop\ODB.NET.Desktop.csproj">
+    <ProjectReference Include="..\OBD.NET.Desktop\OBD.NET.Desktop.csproj">
       <Project>{14CB98E1-95DE-4923-8896-FDF5171AA49E}</Project>
-      <Name>ODB.NET.Desktop</Name>
+      <Name>OBD.NET.Desktop</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/OBD.NET/ODB.NET.ConsoleClient/Program.cs b/OBD.NET/OBD.NET.ConsoleClient/Program.cs
similarity index 96%
rename from OBD.NET/ODB.NET.ConsoleClient/Program.cs
rename to OBD.NET/OBD.NET.ConsoleClient/Program.cs
index 366027a..a76b93a 100644
--- a/OBD.NET/ODB.NET.ConsoleClient/Program.cs
+++ b/OBD.NET/OBD.NET.ConsoleClient/Program.cs
@@ -5,10 +5,10 @@ using OBD.NET.Common.Devices;
 using OBD.NET.Common.Extensions;
 using OBD.NET.Common.Logging;
 using OBD.NET.Common.OBDData;
-using ODB.NET.Desktop.Communication;
-using ODB.NET.Desktop.Logging;
+using OBD.NET.Desktop.Communication;
+using OBD.NET.Desktop.Logging;
 
-namespace ODB.NET.ConsoleClient
+namespace OBD.NET.ConsoleClient
 {
     public class Program
     {
diff --git a/OBD.NET/ODB.NET.ConsoleClient/Properties/AssemblyInfo.cs b/OBD.NET/OBD.NET.ConsoleClient/Properties/AssemblyInfo.cs
similarity index 92%
rename from OBD.NET/ODB.NET.ConsoleClient/Properties/AssemblyInfo.cs
rename to OBD.NET/OBD.NET.ConsoleClient/Properties/AssemblyInfo.cs
index 5873adc..8cabffc 100644
--- a/OBD.NET/ODB.NET.ConsoleClient/Properties/AssemblyInfo.cs
+++ b/OBD.NET/OBD.NET.ConsoleClient/Properties/AssemblyInfo.cs
@@ -4,11 +4,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("ODB.NET.ConsoleClient")]
+[assembly: AssemblyTitle("OBD.NET.ConsoleClient")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ODB.NET.ConsoleClient")]
+[assembly: AssemblyProduct("OBD.NET.ConsoleClient")]
 [assembly: AssemblyCopyright("Copyright ©  2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/OBD.NET/ODB.NET.Desktop/Communication/EnhancedSerialPort.cs b/OBD.NET/OBD.NET.Desktop/Communication/EnhancedSerialPort.cs
similarity index 99%
rename from OBD.NET/ODB.NET.Desktop/Communication/EnhancedSerialPort.cs
rename to OBD.NET/OBD.NET.Desktop/Communication/EnhancedSerialPort.cs
index 74f66a4..af5dc8a 100644
--- a/OBD.NET/ODB.NET.Desktop/Communication/EnhancedSerialPort.cs
+++ b/OBD.NET/OBD.NET.Desktop/Communication/EnhancedSerialPort.cs
@@ -21,7 +21,7 @@ using System.Runtime.InteropServices;
 using System.Threading;
 
 // Source: http://antanas.veiverys.com/mono-serialport-datareceived-event-workaround-using-a-derived-class/
-namespace ODB.NET.Desktop.Communication
+namespace OBD.NET.Desktop.Communication
 {
     [DesignerCategory("Code")]
     public class EnhancedSerialPort : SerialPort
diff --git a/OBD.NET/ODB.NET.Desktop/Communication/SerialConnection.cs b/OBD.NET/OBD.NET.Desktop/Communication/SerialConnection.cs
similarity index 98%
rename from OBD.NET/ODB.NET.Desktop/Communication/SerialConnection.cs
rename to OBD.NET/OBD.NET.Desktop/Communication/SerialConnection.cs
index b20bdfc..2cb622d 100644
--- a/OBD.NET/ODB.NET.Desktop/Communication/SerialConnection.cs
+++ b/OBD.NET/OBD.NET.Desktop/Communication/SerialConnection.cs
@@ -6,7 +6,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using OBD.NET.Common.Communication;
 
-namespace ODB.NET.Desktop.Communication
+namespace OBD.NET.Desktop.Communication
 {
     public class SerialConnection : ISerialConnection
     {
diff --git a/OBD.NET/ODB.NET.Desktop/Logging/ODBConsoleLogger.cs b/OBD.NET/OBD.NET.Desktop/Logging/ODBConsoleLogger.cs
similarity index 95%
rename from OBD.NET/ODB.NET.Desktop/Logging/ODBConsoleLogger.cs
rename to OBD.NET/OBD.NET.Desktop/Logging/ODBConsoleLogger.cs
index 9e5522b..9f630d1 100644
--- a/OBD.NET/ODB.NET.Desktop/Logging/ODBConsoleLogger.cs
+++ b/OBD.NET/OBD.NET.Desktop/Logging/ODBConsoleLogger.cs
@@ -1,7 +1,7 @@
 using System;
 using OBD.NET.Common.Logging;
 
-namespace ODB.NET.Desktop.Logging
+namespace OBD.NET.Desktop.Logging
 {
     /// <summary>
     /// Simple console logger
diff --git a/OBD.NET/ODB.NET.Desktop/ODB.NET.Desktop.csproj b/OBD.NET/OBD.NET.Desktop/OBD.NET.Desktop.csproj
similarity index 100%
rename from OBD.NET/ODB.NET.Desktop/ODB.NET.Desktop.csproj
rename to OBD.NET/OBD.NET.Desktop/OBD.NET.Desktop.csproj
diff --git a/OBD.NET/OBD.NET.sln b/OBD.NET/OBD.NET.sln
index c8614b3..6e8a543 100644
--- a/OBD.NET/OBD.NET.sln
+++ b/OBD.NET/OBD.NET.sln
@@ -5,11 +5,11 @@ VisualStudioVersion = 15.0.26403.7
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OBD.NET.Common", "OBD.NET.Common\OBD.NET.Common.csproj", "{D985B70E-CDF3-4CF1-AB5D-8D19C7FE7B31}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ODB.NET.Desktop", "ODB.NET.Desktop\ODB.NET.Desktop.csproj", "{14CB98E1-95DE-4923-8896-FDF5171AA49E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OBD.NET.Desktop", "OBD.NET.Desktop\OBD.NET.Desktop.csproj", "{14CB98E1-95DE-4923-8896-FDF5171AA49E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OBD.NET.Universal", "OBD.NET.Universal\OBD.NET.Universal.csproj", "{E0EAFF82-C514-4827-8F49-F1928EBA8E73}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ODB.NET.ConsoleClient", "ODB.NET.ConsoleClient\ODB.NET.ConsoleClient.csproj", "{8F8EC5D5-94BD-47CF-9714-CA8C0198BDDC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OBD.NET.ConsoleClient", "OBD.NET.ConsoleClient\OBD.NET.ConsoleClient.csproj", "{8F8EC5D5-94BD-47CF-9714-CA8C0198BDDC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution