diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 324dc71f..cc85f350 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -199,8 +199,8 @@ EgwProxy.Icoel:build:staging:
      - main
      - master
  before_script:
-#   - *nuget-fix
-#   - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
+   - *nuget-fix
+   - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
    - *version-fix
  script:  
     - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/$env:CONFIG /verbosity:minimal /m'
diff --git a/IOB-WIN-NEXT.sln b/IOB-WIN-NEXT.sln
index af7b9d05..1568a71e 100644
--- a/IOB-WIN-NEXT.sln
+++ b/IOB-WIN-NEXT.sln
@@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersGen", "VersGen\VersGen.
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CncLib", "CncLib\CncLib.vbproj", "{2D769FFD-1122-4276-A115-29246E6D23C5}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CVCncLib", "CVCncLib\CVCncLib.vbproj", "{DC6B309E-F8E9-4BA2-A621-4F617C072533}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EgwProxy.OsaiCncLib", "EgwProxy.OsaiCncLib\EgwProxy.OsaiCncLib.vbproj", "{DC6B309E-F8E9-4BA2-A621-4F617C072533}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B52E3E86-1B82-4F4D-982C-0C8909CD2A28}"
 	ProjectSection(SolutionItems) = preProject
diff --git a/IOB-WIN-NEXT/AdapterForm.cs b/IOB-WIN-NEXT/AdapterForm.cs
index ae796100..8a643b7a 100644
--- a/IOB-WIN-NEXT/AdapterForm.cs
+++ b/IOB-WIN-NEXT/AdapterForm.cs
@@ -1289,7 +1289,7 @@ namespace IOB_WIN_NEXT
                     case tipoAdapter.OSAI_OPEN:
                     case tipoAdapter.OSAI_CNDEX:
                     case tipoAdapter.OSAI_VB6:
-                        // versione CVCncLib
+                        // versione EgwProxy.OsaiCncLib
                         iobObj = new IobOSAI(this, IOBConf);
                         start.Enabled = true;
                         break;
diff --git a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
index 6eeeb9bd..d317d19c 100644
--- a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
+++ b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
@@ -846,9 +846,9 @@
       <Project>{2d769ffd-1122-4276-a115-29246e6d23c5}</Project>
       <Name>CncLib</Name>
     </ProjectReference>
-    <ProjectReference Include="..\CVCncLib\CVCncLib.vbproj">
+    <ProjectReference Include="..\EgwProxy.OsaiCncLib\EgwProxy.OsaiCncLib.vbproj">
       <Project>{dc6b309e-f8e9-4ba2-a621-4f617c072533}</Project>
-      <Name>CVCncLib</Name>
+      <Name>EgwProxy.OsaiCncLib</Name>
     </ProjectReference>
     <ProjectReference Include="..\IOB-UT-NEXT\IOB-UT-NEXT.csproj">
       <Project>{90512e12-29fc-460d-94cc-648c2a072dbd}</Project>
diff --git a/IOB-WIN-NEXT/IobOSAI.cs b/IOB-WIN-NEXT/IobOSAI.cs
index 00ad5c04..d6e1ec21 100644
--- a/IOB-WIN-NEXT/IobOSAI.cs
+++ b/IOB-WIN-NEXT/IobOSAI.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Net.NetworkInformation;
-using CVCncLib;
+using EgwProxy.OsaiCncLib;
 
 namespace IOB_WIN_NEXT
 {
diff --git a/IOB-WIN.sln b/IOB-WIN.sln
index b6791bb9..793ca0f2 100644
--- a/IOB-WIN.sln
+++ b/IOB-WIN.sln
@@ -14,7 +14,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IOB-UT", "IOB-UT\IOB-UT.csp
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CncLib", "CncLib\CncLib.vbproj", "{2D769FFD-1122-4276-A115-29246E6D23C5}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CVCncLib", "CVCncLib\CVCncLib.vbproj", "{DC6B309E-F8E9-4BA2-A621-4F617C072533}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EgwProxy.OsaiCncLib", "EgwProxy.OsaiCncLib\EgwProxy.OsaiCncLib.vbproj", "{DC6B309E-F8E9-4BA2-A621-4F617C072533}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B52E3E86-1B82-4F4D-982C-0C8909CD2A28}"
 	ProjectSection(SolutionItems) = preProject
diff --git a/IOB-WIN/AdapterForm.cs b/IOB-WIN/AdapterForm.cs
index 33355155..ddced4d2 100644
--- a/IOB-WIN/AdapterForm.cs
+++ b/IOB-WIN/AdapterForm.cs
@@ -1162,7 +1162,7 @@ namespace IOB_WIN
                     case tipoAdapter.OSAI_OPEN:
                     case tipoAdapter.OSAI_CNDEX:
                     case tipoAdapter.OSAI_VB6:
-                        // versione CVCncLib
+                        // versione EgwProxy.OsaiCncLib
                         iobObj = new IobOSAI(this, IOBConf);
                         start.Enabled = true;
                         break;
diff --git a/IOB-WIN/IOB-WIN.csproj b/IOB-WIN/IOB-WIN.csproj
index 53bf55cd..2fa262e2 100644
--- a/IOB-WIN/IOB-WIN.csproj
+++ b/IOB-WIN/IOB-WIN.csproj
@@ -605,9 +605,9 @@
       <Project>{2d769ffd-1122-4276-a115-29246e6d23c5}</Project>
       <Name>CncLib</Name>
     </ProjectReference>
-    <ProjectReference Include="..\CVCncLib\CVCncLib.vbproj">
+    <ProjectReference Include="..\EgwProxy.OsaiCncLib\EgwProxy.OsaiCncLib.vbproj">
       <Project>{dc6b309e-f8e9-4ba2-a621-4f617c072533}</Project>
-      <Name>CVCncLib</Name>
+      <Name>EgwProxy.OsaiCncLib</Name>
     </ProjectReference>
     <ProjectReference Include="..\IOB-UT\IOB-UT.csproj">
       <Project>{90512e12-29fc-460d-94cc-648c2a072dbd}</Project>
diff --git a/IOB-WIN/IobOSAI.cs b/IOB-WIN/IobOSAI.cs
index 827660b4..960c7085 100644
--- a/IOB-WIN/IobOSAI.cs
+++ b/IOB-WIN/IobOSAI.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Net.NetworkInformation;
-using CVCncLib;
+using EgwProxy.OsaiCncLib;
 
 namespace IOB_WIN
 {