diff --git a/Thermo.Active.Database/Migrations/201806130949510_InitMigration.Designer.cs b/Thermo.Active.Database/Migrations/201806130949510_InitMigration.Designer.cs
index b4f68a74..d11ed5ce 100644
--- a/Thermo.Active.Database/Migrations/201806130949510_InitMigration.Designer.cs
+++ b/Thermo.Active.Database/Migrations/201806130949510_InitMigration.Designer.cs
@@ -1,5 +1,5 @@
 // <auto-generated />
-namespace Step.Database.Migrations
+namespace Thermo.Active.Database.Migrations
 {
     using System.CodeDom.Compiler;
     using System.Data.Entity.Migrations;
diff --git a/Thermo.Active.Database/Migrations/201806130949510_InitMigration.cs b/Thermo.Active.Database/Migrations/201806130949510_InitMigration.cs
index e080af97..48d0155f 100644
--- a/Thermo.Active.Database/Migrations/201806130949510_InitMigration.cs
+++ b/Thermo.Active.Database/Migrations/201806130949510_InitMigration.cs
@@ -1,4 +1,4 @@
-namespace Step.Database.Migrations
+namespace Thermo.Active.Database.Migrations
 {
     using System;
     using System.Data.Entity.Migrations;
diff --git a/Thermo.Active.Database/Migrations/201807120908403_InitMigration.Designer.cs b/Thermo.Active.Database/Migrations/201807120908403_InitMigration.Designer.cs
index e85b13ea..29f6c6e4 100644
--- a/Thermo.Active.Database/Migrations/201807120908403_InitMigration.Designer.cs
+++ b/Thermo.Active.Database/Migrations/201807120908403_InitMigration.Designer.cs
@@ -1,5 +1,5 @@
 // <auto-generated />
-namespace Step.Database.Migrations
+namespace Thermo.Active.Database.Migrations
 {
     using System.CodeDom.Compiler;
     using System.Data.Entity.Migrations;
diff --git a/Thermo.Active.Database/Migrations/201807120908403_InitMigration.cs b/Thermo.Active.Database/Migrations/201807120908403_InitMigration.cs
index 13fd7834..d480f387 100644
--- a/Thermo.Active.Database/Migrations/201807120908403_InitMigration.cs
+++ b/Thermo.Active.Database/Migrations/201807120908403_InitMigration.cs
@@ -1,4 +1,4 @@
-namespace Step.Database.Migrations
+namespace Thermo.Active.Database.Migrations
 {
     using System;
     using System.Data.Entity.Migrations;
diff --git a/Thermo.Active.Database/Migrations/201810100646276_InitMigration.Designer.cs b/Thermo.Active.Database/Migrations/201810100646276_InitMigration.Designer.cs
index f0370a55..433f4493 100644
--- a/Thermo.Active.Database/Migrations/201810100646276_InitMigration.Designer.cs
+++ b/Thermo.Active.Database/Migrations/201810100646276_InitMigration.Designer.cs
@@ -1,5 +1,5 @@
 // <auto-generated />
-namespace Step.Database.Migrations
+namespace Thermo.Active.Database.Migrations
 {
     using System.CodeDom.Compiler;
     using System.Data.Entity.Migrations;
diff --git a/Thermo.Active.Database/Migrations/201810100646276_InitMigration.cs b/Thermo.Active.Database/Migrations/201810100646276_InitMigration.cs
index 382b3960..c169289c 100644
--- a/Thermo.Active.Database/Migrations/201810100646276_InitMigration.cs
+++ b/Thermo.Active.Database/Migrations/201810100646276_InitMigration.cs
@@ -1,4 +1,4 @@
-namespace Step.Database.Migrations
+namespace Thermo.Active.Database.Migrations
 {
     using System;
     using System.Data.Entity.Migrations;
diff --git a/Thermo.Active.sln b/Thermo.Active.sln
index 6324d762..0eb674ba 100644
--- a/Thermo.Active.sln
+++ b/Thermo.Active.sln
@@ -25,7 +25,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Thermo.Active.Utils", "Ther
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CMS.Client", "CMS.Client", "{2F873243-A483-40B6-A0F7-65FC3541A269}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CMS.Termo.Active", "CMS.Termo.Active", "{0769EE3C-4259-4C72-97B4-0CCAEBFA7724}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CMS.Thermo.Active", "CMS.Thermo.Active", "{0769EE3C-4259-4C72-97B4-0CCAEBFA7724}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client.Config", "Client.Config\Client.Config.csproj", "{205A6ADE-FB5A-45CB-9C51-9817E7BB8939}"
 EndProject
diff --git a/Thermo.Active/App_Start/Startup.cs b/Thermo.Active/App_Start/Startup.cs
index 2a22dab8..12991bdc 100644
--- a/Thermo.Active/App_Start/Startup.cs
+++ b/Thermo.Active/App_Start/Startup.cs
@@ -18,7 +18,7 @@ using System.Web.Http;
 using static Thermo.Active.Config.ServerConfig;
 using static Thermo.Active.Model.Constants;
 
-[assembly: OwinStartup(typeof(Step.App_Start.Startup))]
+[assembly: OwinStartup(typeof(Thermo.Active.App_Start.Startup))]
 
 namespace Thermo.Active.App_Start
 {
diff --git a/Thermo.Active/Thermo.Active.csproj b/Thermo.Active/Thermo.Active.csproj
index 82d904ed..58781720 100644
--- a/Thermo.Active/Thermo.Active.csproj
+++ b/Thermo.Active/Thermo.Active.csproj
@@ -16434,7 +16434,7 @@
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject>Step.Application</StartupObject>
+    <StartupObject>Thermo.Active.Application</StartupObject>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>ACTIVE_ICONA.ico</ApplicationIcon>