diff --git a/ATXConfigTest/ATXConfigTest.csproj b/ATXConfigTest/ATXConfigTest.csproj
index 08f32fb33144eaa114da6b425dffc80267e0073c..30fd87490c9cc74690b24565a9f5a84e215f8b63 100644
--- a/ATXConfigTest/ATXConfigTest.csproj
+++ b/ATXConfigTest/ATXConfigTest.csproj
@@ -53,9 +53,9 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ATXCommon\ATXCommon.csproj">
+    <ProjectReference Include="..\ATxCommon\ATxCommon.csproj">
       <Project>{166D65D5-EE10-4364-8AA3-4D86BA5CE244}</Project>
-      <Name>ATXCommon</Name>
+      <Name>ATxCommon</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/ATXConfigTest/AutoTxConfigTest.cs b/ATXConfigTest/AutoTxConfigTest.cs
index 47af5d81d1400d551c0ed2e88b1315d06b0036c6..135cad83ec27fc97d116e2b0db474646c18dd605 100644
--- a/ATXConfigTest/AutoTxConfigTest.cs
+++ b/ATXConfigTest/AutoTxConfigTest.cs
@@ -1,8 +1,8 @@
 using System;
 using System.IO;
+using ATxCommon.Serializables;
 using NLog;
 using NLog.Config;
-using ATXCommon.Serializables;
 
 namespace ATXConfigTest
 {
diff --git a/ATXService.sln b/ATXService.sln
index 626d82345992c0be34ef79936c103ca162c18f8a..f02ed064acdbb5253eca200534b0b6210fe5c3d5 100644
--- a/ATXService.sln
+++ b/ATXService.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 12.0.40629.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ATXProject", "AutoTx\ATXProject.csproj", "{5CB67E3A-E63A-4791-B90B-8CEF0027AEAD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ATXCommon", "ATXCommon\ATXCommon.csproj", "{166D65D5-EE10-4364-8AA3-4D86BA5CE244}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ATxCommon", "ATxCommon\ATxCommon.csproj", "{166D65D5-EE10-4364-8AA3-4D86BA5CE244}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ATXConfigTest", "ATXConfigTest\ATXConfigTest.csproj", "{81E0A5AC-0E0D-4F98-B399-41A58612EF33}"
 EndProject
diff --git a/ATXTray/ATXTray.csproj b/ATXTray/ATXTray.csproj
index e64ce3107a09b49b58117ae279f07b5fcc6e8fda..d3f0902541f0e7f9ceab46936140867350e75b48 100644
--- a/ATXTray/ATXTray.csproj
+++ b/ATXTray/ATXTray.csproj
@@ -93,9 +93,9 @@
     <Content Include="AutoTx.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ATXCommon\ATXCommon.csproj">
+    <ProjectReference Include="..\ATxCommon\ATxCommon.csproj">
       <Project>{166D65D5-EE10-4364-8AA3-4D86BA5CE244}</Project>
-      <Name>ATXCommon</Name>
+      <Name>ATxCommon</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/ATXTray/AutoTxTray.cs b/ATXTray/AutoTxTray.cs
index 0f2a971ab4bffe52710f0fd64de77f454c506cea..311fa6c7dc2e5a98aa18d2625b6cb5b050fd3d22 100644
--- a/ATXTray/AutoTxTray.cs
+++ b/ATXTray/AutoTxTray.cs
@@ -4,7 +4,7 @@ using System.Timers;
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
-using ATXCommon.Serializables;
+using ATxCommon.Serializables;
 using Microsoft.WindowsAPICodePack.Dialogs;
 using NLog;
 using NLog.Config;
diff --git a/ATXCommon/ATXCommon.csproj b/ATxCommon/ATxCommon.csproj
similarity index 97%
rename from ATXCommon/ATXCommon.csproj
rename to ATxCommon/ATxCommon.csproj
index a2297d0690cc0df52a27fb4522b881d06eb3affd..aee0a693b530abd32dde3b1ef5155ea6af18a847 100644
--- a/ATXCommon/ATXCommon.csproj
+++ b/ATxCommon/ATxCommon.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{166D65D5-EE10-4364-8AA3-4D86BA5CE244}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ATXCommon</RootNamespace>
-    <AssemblyName>ATXCommon</AssemblyName>
+    <RootNamespace>ATxCommon</RootNamespace>
+    <AssemblyName>ATxCommon</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
diff --git a/ATXCommon/ActiveDirectory.cs b/ATxCommon/ActiveDirectory.cs
similarity index 98%
rename from ATXCommon/ActiveDirectory.cs
rename to ATxCommon/ActiveDirectory.cs
index 6fd6335713ca0d8fb04d3a5eae6bdf6a4def17fc..063f9eb47e2f64b73dc28b704788534d90b32074 100644
--- a/ATXCommon/ActiveDirectory.cs
+++ b/ATxCommon/ActiveDirectory.cs
@@ -2,7 +2,7 @@
 using System.DirectoryServices.AccountManagement;
 using NLog;
 
-namespace ATXCommon
+namespace ATxCommon
 {
     public static class ActiveDirectory
     {
diff --git a/ATXCommon/Conv.cs b/ATxCommon/Conv.cs
similarity index 97%
rename from ATXCommon/Conv.cs
rename to ATxCommon/Conv.cs
index b0516aa7de96a3d6d7dd32b62203ec4d8fd2e8a8..004e59d395f95683bbb63d1dafc3124948f4b706 100644
--- a/ATXCommon/Conv.cs
+++ b/ATxCommon/Conv.cs
@@ -1,4 +1,4 @@
-namespace ATXCommon
+namespace ATxCommon
 {
     public static class Conv
     {
diff --git a/ATXCommon/FsUtils.cs b/ATxCommon/FsUtils.cs
similarity index 99%
rename from ATXCommon/FsUtils.cs
rename to ATxCommon/FsUtils.cs
index a9eb50bfdcd764b92273e1986df3bd4d44951efa..446bb35d114971dba9ccd9d5570fdf4f8b6972ca 100644
--- a/ATXCommon/FsUtils.cs
+++ b/ATxCommon/FsUtils.cs
@@ -5,7 +5,7 @@ using System.IO;
 using System.Linq;
 using NLog;
 
-namespace ATXCommon
+namespace ATxCommon
 {
     public static class FsUtils
     {
diff --git a/ATXCommon/NLog/RateLimitWrapper.cs b/ATxCommon/NLog/RateLimitWrapper.cs
similarity index 97%
rename from ATXCommon/NLog/RateLimitWrapper.cs
rename to ATxCommon/NLog/RateLimitWrapper.cs
index b86dded2b94356dc2911d1696277da9074f28f22..2170a48aefe3565e01e05308a8fb743e9c865b69 100644
--- a/ATXCommon/NLog/RateLimitWrapper.cs
+++ b/ATxCommon/NLog/RateLimitWrapper.cs
@@ -4,7 +4,7 @@ using NLog.Common;
 using NLog.Targets;
 using NLog.Targets.Wrappers;
 
-namespace ATXCommon.NLog
+namespace ATxCommon.NLog
 {
     /// <summary>
     /// A wrapper target for NLog, limiting the rate of messages being logged.
diff --git a/ATXCommon/Properties/AssemblyInfo.cs b/ATxCommon/Properties/AssemblyInfo.cs
similarity index 97%
rename from ATXCommon/Properties/AssemblyInfo.cs
rename to ATxCommon/Properties/AssemblyInfo.cs
index 6018b416f9f2a38309c6e2ab44e2fd2644885658..940f65421955479fbd1baa0854802454eebd4688 100644
--- a/ATXCommon/Properties/AssemblyInfo.cs
+++ b/ATxCommon/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ 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("ATXCommon")]
+[assembly: AssemblyTitle("ATxCommon")]
 [assembly: AssemblyDescription("AutoTx Common Runtime Libraries")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Universitaet Basel")]
diff --git a/ATXCommon/Serializables/DriveToCheck.cs b/ATxCommon/Serializables/DriveToCheck.cs
similarity index 95%
rename from ATXCommon/Serializables/DriveToCheck.cs
rename to ATxCommon/Serializables/DriveToCheck.cs
index 553f4750f543c43b19c4b4625e468daa217b2a19..2c43e0c86220652eb492dee439d01293c3208f1e 100644
--- a/ATXCommon/Serializables/DriveToCheck.cs
+++ b/ATxCommon/Serializables/DriveToCheck.cs
@@ -1,6 +1,6 @@
 using System.Xml.Serialization;
 
-namespace ATXCommon.Serializables
+namespace ATxCommon.Serializables
 {
     /// <summary>
     /// Helper class for the nested SpaceMonitoring sections.
diff --git a/ATXCommon/Serializables/ServiceConfig.cs b/ATxCommon/Serializables/ServiceConfig.cs
similarity index 99%
rename from ATXCommon/Serializables/ServiceConfig.cs
rename to ATxCommon/Serializables/ServiceConfig.cs
index bb2a06605a9b2f6415fe96c01a6f3704961a7807..7eb183f5c850f146d08c07dd9f73bd9e13797c1c 100644
--- a/ATXCommon/Serializables/ServiceConfig.cs
+++ b/ATxCommon/Serializables/ServiceConfig.cs
@@ -5,7 +5,7 @@ using System.IO;
 using System.Xml.Serialization;
 using NLog;
 
-namespace ATXCommon.Serializables
+namespace ATxCommon.Serializables
 {
     /// <summary>
     /// AutoTx service configuration class.
diff --git a/ATXCommon/Serializables/ServiceStatus.cs b/ATxCommon/Serializables/ServiceStatus.cs
similarity index 99%
rename from ATXCommon/Serializables/ServiceStatus.cs
rename to ATxCommon/Serializables/ServiceStatus.cs
index cda77dedafa0321f9eb40fad5127887081543733..3d5f9c118eae2b3d52a1780c64c054ea5f770598 100644
--- a/ATXCommon/Serializables/ServiceStatus.cs
+++ b/ATxCommon/Serializables/ServiceStatus.cs
@@ -3,7 +3,7 @@ using System.IO;
 using System.Xml.Serialization;
 using NLog;
 
-namespace ATXCommon.Serializables
+namespace ATxCommon.Serializables
 {
     /// <summary>
     /// AutoTx service status class.
diff --git a/ATXCommon/SystemChecks.cs b/ATxCommon/SystemChecks.cs
similarity index 99%
rename from ATXCommon/SystemChecks.cs
rename to ATxCommon/SystemChecks.cs
index b3832f5d5fd7fd83081bdc39cf7b288be8c91c8b..e65c8f1699f8b91d3fcb45e09d49fadcf471d826 100644
--- a/ATXCommon/SystemChecks.cs
+++ b/ATxCommon/SystemChecks.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Management;
 using NLog;
 
-namespace ATXCommon
+namespace ATxCommon
 {
     public static class SystemChecks
     {
diff --git a/ATXCommon/TimeUtils.cs b/ATxCommon/TimeUtils.cs
similarity index 99%
rename from ATXCommon/TimeUtils.cs
rename to ATxCommon/TimeUtils.cs
index e334161f08708c8a42e240bbc65064ea6a57e3f7..a499a16eff020e2ef42b7e225f6ae2cdc6e1aead 100644
--- a/ATXCommon/TimeUtils.cs
+++ b/ATxCommon/TimeUtils.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace ATXCommon
+namespace ATxCommon
 {
     public static class TimeUtils
     {
diff --git a/AutoTx/ATXProject.csproj b/AutoTx/ATXProject.csproj
index aa53c590e76de1b7ce51a8a289890b3c4d4ae538..6099401c6b80523a07b444f9bd03beb83f800f6d 100644
--- a/AutoTx/ATXProject.csproj
+++ b/AutoTx/ATXProject.csproj
@@ -147,9 +147,9 @@
     <None Include="Resources\BuildCommit.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ATXCommon\ATXCommon.csproj">
+    <ProjectReference Include="..\ATxCommon\ATxCommon.csproj">
       <Project>{166D65D5-EE10-4364-8AA3-4D86BA5CE244}</Project>
-      <Name>ATXCommon</Name>
+      <Name>ATxCommon</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/AutoTx/AutoTx.cs b/AutoTx/AutoTx.cs
index ee781ddb0c7d9e56c8df44892dd53d0dec3c0824..1a14cbc716ad185d7234138db2d6e3c4d00d39d8 100644
--- a/AutoTx/AutoTx.cs
+++ b/AutoTx/AutoTx.cs
@@ -6,12 +6,12 @@ using System.Linq;
 using System.ServiceProcess;
 using System.IO;
 using System.Timers;
+using ATxCommon;
+using ATxCommon.NLog;
+using ATxCommon.Serializables;
 using NLog;
 using NLog.Config;
 using NLog.Targets;
-using ATXCommon;
-using ATXCommon.NLog;
-using ATXCommon.Serializables;
 using RoboSharp;
 
 namespace AutoTx
diff --git a/AutoTx/Email.cs b/AutoTx/Email.cs
index c22fc3b40ae49d5a3ad9aa534dd64a133f690435..2b03b78b91796a38c7f2d9b6dccdda2c23e7f4cb 100644
--- a/AutoTx/Email.cs
+++ b/AutoTx/Email.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Net.Mail;
 using System.Text;
-using ATXCommon;
+using ATxCommon;
 
 namespace AutoTx
 {
diff --git a/AutoTx/RoboCommand.cs b/AutoTx/RoboCommand.cs
index 9fa02ede1c2c4f747d0fa870ded49bc3fc96fb73..bd1ad1937028e6968b0cd812bc94131876ac1c65 100644
--- a/AutoTx/RoboCommand.cs
+++ b/AutoTx/RoboCommand.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 using System.Management;
-using ATXCommon;
+using ATxCommon;
 using RoboSharp;
 
 namespace AutoTx