diff --git a/.teamcity/Ribasim/buildTypes/Ribasim_Windows_Os.xml b/.teamcity/Ribasim/buildTypes/Ribasim_Windows.xml
similarity index 96%
rename from .teamcity/Ribasim/buildTypes/Ribasim_Windows_Os.xml
rename to .teamcity/Ribasim/buildTypes/Ribasim_Windows.xml
index 87b1a65fa..978df74f5 100644
--- a/.teamcity/Ribasim/buildTypes/Ribasim_Windows_Os.xml
+++ b/.teamcity/Ribasim/buildTypes/Ribasim_Windows.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="68fc2e9b-b9f2-42f6-b505-5b68e0df151a" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
-  <name>Os</name>
+  <name>Windows</name>
   <description>Template for agent that uses Windows OS</description>
   <settings>
     <options>
diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildLibribasim.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildLibribasim.xml
index d2249ca64..5ab8cce3f 100644
--- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildLibribasim.xml
+++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildLibribasim.xml
@@ -2,7 +2,7 @@
 <build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="f6699718-828b-4898-bfab-36de06ae4070" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
   <name>Build libribasim</name>
   <description />
-  <settings ref="Ribasim_Windows_Os">
+  <settings ref="Ribasim_Windows">
     <options>
       <option name="artifactRules" value="ribasim\build\libribasim =&gt; libribasim.zip" />
       <option name="executionTimeoutMin" value="120" />
diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasimCli.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasimCli.xml
index 0979e904c..9ff25e3d1 100644
--- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasimCli.xml
+++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_BuildRibasimCli.xml
@@ -2,7 +2,7 @@
 <build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="d8d579b4-0968-4ed7-83e7-e14c1cae8683" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
   <name>Build ribasim_cli</name>
   <description />
-  <settings ref="Ribasim_Windows_Os">
+  <settings ref="Ribasim_Windows">
     <options>
       <option name="artifactRules" value="ribasim\build/ribasim_cli =&gt; ribasim_cli_windows.zip" />
       <option name="executionTimeoutMin" value="120" />
diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml
index 173949191..f5be3f027 100644
--- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml
+++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimApi.xml
@@ -2,7 +2,7 @@
 <build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="27854ba1-bb78-4d7a-b9fd-fecfb86b0393" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
   <name>Test ribasim_api</name>
   <description />
-  <settings ref="Ribasim_Windows_Os">
+  <settings ref="Ribasim_Windows">
     <options>
       <option name="artifactRules" value="ribasim\python\ribasim_api\tests\temp =&gt; test_output.zip" />
     </options>
diff --git a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml
index b6de156b6..643fa02a4 100644
--- a/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml
+++ b/.teamcity/Ribasim_Windows/buildTypes/Ribasim_Windows_TestRibasimCli.xml
@@ -2,7 +2,7 @@
 <build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="d5e2515e-f7f0-4248-9df0-928bb0db1362" xsi:noNamespaceSchemaLocation="https://www.jetbrains.com/teamcity/schemas/2021.1/project-config.xsd">
   <name>Test ribasim_cli</name>
   <description />
-  <settings ref="Ribasim_Windows_Os">
+  <settings ref="Ribasim_Windows">
     <options>
       <option name="artifactRules" value="ribasim\build\tests\temp =&gt; test_output.zip" />
     </options>