diff --git a/EDMI_ClientSuite/frmFileTest.vb b/EDMI_ClientSuite/frmFileTest.vb
index f9f6759a..ed8d94fb 100644
--- a/EDMI_ClientSuite/frmFileTest.vb
+++ b/EDMI_ClientSuite/frmFileTest.vb
@@ -32,9 +32,9 @@ Public Class frmFileTest
             End If
 
             listboxLog.Items.Add($"Document uploaded!")
-            listboxLog.Items.Add($"DocId: {oResult.Document._DocumentId}")
-            listboxLog.Items.Add($"ContainerId: {oResult.Document._ContainerId}")
-            listboxLog.Items.Add($"Filename: {oResult.Document._FileName}")
+            listboxLog.Items.Add($"DocId: {oResult.Document.DocumentId}")
+            listboxLog.Items.Add($"ContainerId: {oResult.Document.ContainerId}")
+            listboxLog.Items.Add($"Filename: {oResult.Document.FileName}")
             listboxLog.Items.Add($"----------------------------------------------------------")
         Catch ex As Exception
             MsgBox(ex.Message)
@@ -55,9 +55,9 @@ Public Class frmFileTest
             Dim oDocObject = oResult.Document
 
             listboxLog.Items.Add($"Document fetched!")
-            listboxLog.Items.Add($"DocId: {oDocObject._DocumentId}")
-            listboxLog.Items.Add($"ContainerId: {oDocObject._ContainerId}")
-            listboxLog.Items.Add($"Filename: {oDocObject._FileName}")
+            listboxLog.Items.Add($"DocId: {oDocObject.DocumentId}")
+            listboxLog.Items.Add($"ContainerId: {oDocObject.ContainerId}")
+            listboxLog.Items.Add($"Filename: {oDocObject.FileName}")
             listboxLog.Items.Add($"----------------------------------------------------------")
         Catch ex As Exception
             _ErrorHandler.ShowErrorMessage(ex)
@@ -77,9 +77,9 @@ Public Class frmFileTest
             Dim oDocObject = oResult.Document
 
             listboxLog.Items.Add($"Document fetched!")
-            listboxLog.Items.Add($"DocId: {oDocObject._DocumentId}")
-            listboxLog.Items.Add($"ContainerId: {oDocObject._ContainerId}")
-            listboxLog.Items.Add($"Filename: {oDocObject._FileName}")
+            listboxLog.Items.Add($"DocId: {oDocObject.DocumentId}")
+            listboxLog.Items.Add($"ContainerId: {oDocObject.ContainerId}")
+            listboxLog.Items.Add($"Filename: {oDocObject.FileName}")
             listboxLog.Items.Add($"----------------------------------------------------------")
         Catch ex As Exception
             _ErrorHandler.ShowErrorMessage(ex)
diff --git a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Modules.Filesystem.xsd b/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Modules.Filesystem.xsd
index b1e687d9..74df549b 100644
--- a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Modules.Filesystem.xsd	
+++ b/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/DigitalData.Modules.Filesystem.xsd	
@@ -2,9 +2,9 @@
 <xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:complexType name="DocumentObject">
     <xs:sequence>
-      <xs:element name="_ContainerId" nillable="true" type="xs:string" />
-      <xs:element name="_DocumentId" type="xs:long" />
-      <xs:element name="_FileName" nillable="true" type="xs:string" />
+      <xs:element name="ContainerId" nillable="true" type="xs:string" />
+      <xs:element name="DocumentId" type="xs:long" />
+      <xs:element name="FileName" nillable="true" type="xs:string" />
     </xs:sequence>
   </xs:complexType>
   <xs:element name="DocumentObject" nillable="true" type="tns:DocumentObject" />
diff --git a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/Reference.vb b/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/Reference.vb
index ac61e4c2..7f3c0fdc 100644
--- a/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/Reference.vb	
+++ b/EDMI_FILE_OPs/Connected Services/EDMIServiceReference/Reference.vb	
@@ -234,11 +234,11 @@ Namespace EDMIServiceReference
         <System.NonSerializedAttribute()>  _
         Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject
         
-        Private _ContainerIdField As String
+        Private ContainerIdField As String
         
-        Private _DocumentIdField As Long
+        Private DocumentIdField As Long
         
-        Private _FileNameField As String
+        Private FileNameField As String
         
         <Global.System.ComponentModel.BrowsableAttribute(false)>  _
         Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData
@@ -251,40 +251,40 @@ Namespace EDMIServiceReference
         End Property
         
         <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
-        Public Property _ContainerId() As String
+        Public Property ContainerId() As String
             Get
-                Return Me._ContainerIdField
+                Return Me.ContainerIdField
             End Get
             Set
-                If (Object.ReferenceEquals(Me._ContainerIdField, value) <> true) Then
-                    Me._ContainerIdField = value
-                    Me.RaisePropertyChanged("_ContainerId")
+                If (Object.ReferenceEquals(Me.ContainerIdField, value) <> true) Then
+                    Me.ContainerIdField = value
+                    Me.RaisePropertyChanged("ContainerId")
                 End If
             End Set
         End Property
         
         <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
-        Public Property _DocumentId() As Long
+        Public Property DocumentId() As Long
             Get
-                Return Me._DocumentIdField
+                Return Me.DocumentIdField
             End Get
             Set
-                If (Me._DocumentIdField.Equals(value) <> true) Then
-                    Me._DocumentIdField = value
-                    Me.RaisePropertyChanged("_DocumentId")
+                If (Me.DocumentIdField.Equals(value) <> true) Then
+                    Me.DocumentIdField = value
+                    Me.RaisePropertyChanged("DocumentId")
                 End If
             End Set
         End Property
         
         <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
-        Public Property _FileName() As String
+        Public Property FileName() As String
             Get
-                Return Me._FileNameField
+                Return Me.FileNameField
             End Get
             Set
-                If (Object.ReferenceEquals(Me._FileNameField, value) <> true) Then
-                    Me._FileNameField = value
-                    Me.RaisePropertyChanged("_FileName")
+                If (Object.ReferenceEquals(Me.FileNameField, value) <> true) Then
+                    Me.FileNameField = value
+                    Me.RaisePropertyChanged("FileName")
                 End If
             End Set
         End Property
diff --git a/Filesystem/DocumentObject.vb b/Filesystem/DocumentObject.vb
index 90b727fe..c9da13f0 100644
--- a/Filesystem/DocumentObject.vb
+++ b/Filesystem/DocumentObject.vb
@@ -1,12 +1,18 @@
-<Serializable>
+Imports System.Runtime.Serialization
+
+<Serializable>
 Public Class DocumentObject
-    Public ReadOnly Property FileName As String
-    Public ReadOnly Property ContainerId As String
-    Public ReadOnly Property DocumentId As Int64
+
+    <DataMember(Name:="FileName")>
+    Public ReadOnly FileName As String
+    <DataMember(Name:="ContainerId")>
+    Public ReadOnly ContainerId As String
+    <DataMember(Name:="DocumentId")>
+    Public ReadOnly DocumentId As Int64
 
     Public Sub New(ContainerId As String, DocumentId As Int64, FileName As String)
-        _ContainerId = ContainerId
-        _DocumentId = DocumentId
-        _FileName = FileName
+        Me.ContainerId = ContainerId
+        Me.DocumentId = DocumentId
+        Me.FileName = FileName
     End Sub
 End Class
diff --git a/Message/Email.vb b/Message/Email.vb
index 56c57bf6..01705121 100644
--- a/Message/Email.vb
+++ b/Message/Email.vb
@@ -1,13 +1,11 @@
-Imports System
-Imports Independentsoft.Email
+Imports Independentsoft.Email
 Imports Independentsoft.Email.Pop3
 Imports Independentsoft.Email.Smtp
 Imports Independentsoft.Email.Mime
 Imports Independentsoft.Email.Imap
-
 Imports DigitalData.Modules.Logging
 Public Class Email
-    Private _logger As DigitalData.Modules.Logging.Logger
+    Private _logger As Logging.Logger
     Private _logConfig As LogConfig
     Public Sub New(LogConfig As LogConfig)
         _logger = LogConfig.GetLogger()
diff --git a/SERVICES/DDEDM_NetworkService/Results/IndexResult.vb b/SERVICES/DDEDM_NetworkService/Results/IndexResult.vb
index 38e970ab..ac31956b 100644
--- a/SERVICES/DDEDM_NetworkService/Results/IndexResult.vb
+++ b/SERVICES/DDEDM_NetworkService/Results/IndexResult.vb
@@ -1,6 +1,4 @@
-Imports DigitalData.Modules.Filesystem
-
-<Serializable>
+<Serializable>
 Public Class IndexResult
     Inherits BaseResult