diff --git a/DDZUGFeRDService/ZUGFeRDService.vb b/DDZUGFeRDService/ZUGFeRDService.vb
index cdf5aa3e..7240e66e 100644
--- a/DDZUGFeRDService/ZUGFeRDService.vb
+++ b/DDZUGFeRDService/ZUGFeRDService.vb
@@ -38,7 +38,7 @@ Public Class ZUGFeRDService
         End If
 
         Try
-            _threadRunner = New ThreadRunner(_logConfig, oGDPictureKey, _firebird, _mssql)
+            _threadRunner = New ThreadRunner(_logConfig, _firebird, _mssql)
             _threadRunner.Start(oJobInterval)
         Catch ex As Exception
             _logger.Error(ex)
diff --git a/GUIs.ClientSuite/ClassService.vb b/GUIs.ClientSuite/ClassService.vb
index 3c35876b..44d91658 100644
--- a/GUIs.ClientSuite/ClassService.vb
+++ b/GUIs.ClientSuite/ClassService.vb
@@ -1,8 +1,8 @@
 Imports System.ServiceModel
 Imports System.ServiceModel.Channels
 Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.EDMIAPI
-Imports DigitalData.Modules.EDMIAPI.IDBServiceReference
+Imports DigitalData.Modules.EDMI.API
+Imports DigitalData.Modules.EDMI.API.IDBServiceReference
 Imports DigitalData.GUIs.ClientSuite.Base
 Imports System.ServiceModel.Security
 
diff --git a/GUIs.ClientSuite/Common/ClassCommonCommands.vb b/GUIs.ClientSuite/Common/ClassCommonCommands.vb
index 9d7a095a..7825b62e 100644
--- a/GUIs.ClientSuite/Common/ClassCommonCommands.vb
+++ b/GUIs.ClientSuite/Common/ClassCommonCommands.vb
@@ -1,5 +1,5 @@
 Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.EDMIAPI.IDBServiceReference
+Imports DigitalData.Modules.EDMI.API.IDBServiceReference
 
 Public Class ClassCommonCommands
     Private _LogConfig As LogConfig
diff --git a/GUIs.ClientSuite/MyApplication.vb b/GUIs.ClientSuite/MyApplication.vb
index 03edb16c..780ddc56 100644
--- a/GUIs.ClientSuite/MyApplication.vb
+++ b/GUIs.ClientSuite/MyApplication.vb
@@ -2,7 +2,7 @@
 Imports System.Threading
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.EDMIAPI.IDBServiceReference
+Imports DigitalData.Modules.EDMI.API.IDBServiceReference
 
 Namespace My
     ''' <summary>
diff --git a/GUIs.ClientSuite/_TEST/frmFileTest.vb b/GUIs.ClientSuite/_TEST/frmFileTest.vb
index d6cb5224..c09d1395 100644
--- a/GUIs.ClientSuite/_TEST/frmFileTest.vb
+++ b/GUIs.ClientSuite/_TEST/frmFileTest.vb
@@ -1,5 +1,5 @@
 Imports System.IO
-Imports DigitalData.Modules.EDMIAPI
+Imports DigitalData.Modules.EDMI.API
 Imports DigitalData.Modules.Logging
 
 Public Class frmFileTest
diff --git a/GUIs.ClientSuite/frmSplash.vb b/GUIs.ClientSuite/frmSplash.vb
index 62e1631c..4e6563dc 100644
--- a/GUIs.ClientSuite/frmSplash.vb
+++ b/GUIs.ClientSuite/frmSplash.vb
@@ -2,7 +2,7 @@
 Imports System.ServiceModel
 Imports System.Threading
 Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.EDMIAPI.IDBServiceReference
+Imports DigitalData.Modules.EDMI.API.IDBServiceReference
 
 Public NotInheritable Class frmSplash
     Private _Worker As New BackgroundWorker()
diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj
index 38ae620b..6e79c28f 100644
--- a/GUIs.ZooFlow/ZooFlow.vbproj
+++ b/GUIs.ZooFlow/ZooFlow.vbproj
@@ -183,7 +183,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\GUIs.ClipboardWatcher\ClipboardWatcher.vbproj">
-      <Project>{b7d465a2-ae31-4cdf-a8b2-34b42d3ea84e}</Project>
+      <Project>{B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E}</Project>
       <Name>ClipboardWatcher</Name>
     </ProjectReference>
     <ProjectReference Include="..\Modules.Config\Config.vbproj">