diff --git a/ComIOP/Wrapper/ServerWrapper/Opc.Ua.ComServerWrapper.Config.xml b/ComIOP/Wrapper/ServerWrapper/Opc.Ua.ComServerWrapper.Config.xml
index 6bdf0826ba..f6b0d79e0f 100644
--- a/ComIOP/Wrapper/ServerWrapper/Opc.Ua.ComServerWrapper.Config.xml
+++ b/ComIOP/Wrapper/ServerWrapper/Opc.Ua.ComServerWrapper.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=UA COM Server Wrapper, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
     <!-- Where the trust list is stored (UA Applications) -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
 
     <!-- WARNING: The following setting (to automatically accept untrusted certificates) should be used
diff --git a/SampleApplications/Samples/Client.Net4/Opc.Ua.SampleClient.Config.xml b/SampleApplications/Samples/Client.Net4/Opc.Ua.SampleClient.Config.xml
index 370ee58ae7..c957eefa1c 100644
--- a/SampleApplications/Samples/Client.Net4/Opc.Ua.SampleClient.Config.xml
+++ b/SampleApplications/Samples/Client.Net4/Opc.Ua.SampleClient.Config.xml
@@ -53,7 +53,7 @@
          specify the certificate for each trusted certification authority. -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
     
     <!-- The list of trusted certificates. 
@@ -72,7 +72,7 @@
          -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
     
     <!-- Applications exchange Nonces during the CreateSession. This value specifies the length. Must be >= 32 -->
@@ -81,7 +81,7 @@
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
 
     <!-- Specifies whether the complete certificate chain should be sent for CA signed certificates. -->
diff --git a/SampleApplications/Samples/Client/Opc.Ua.SampleClient.Config.xml b/SampleApplications/Samples/Client/Opc.Ua.SampleClient.Config.xml
index 334f1ff0c9..6926efc016 100644
--- a/SampleApplications/Samples/Client/Opc.Ua.SampleClient.Config.xml
+++ b/SampleApplications/Samples/Client/Opc.Ua.SampleClient.Config.xml
@@ -53,7 +53,7 @@
          specify the certificate for each trusted certification authority. -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalFolder%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%LocalFolder%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
     
     <!-- The list of trusted certificates. 
@@ -72,7 +72,7 @@
          -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalFolder%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%LocalFolder%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
     
     <!-- Applications exchange Nonces during the CreateSession. This value specifies the length. Must be >= 32 -->
@@ -81,7 +81,7 @@
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalFolder%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%LocalFolder%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
   
 </SecurityConfiguration>
diff --git a/SampleApplications/Samples/GDS/Client/Opc.Ua.GdsClient.Config.xml b/SampleApplications/Samples/GDS/Client/Opc.Ua.GdsClient.Config.xml
index 9e3c5b8e98..3a8d23b350 100644
--- a/SampleApplications/Samples/GDS/Client/Opc.Ua.GdsClient.Config.xml
+++ b/SampleApplications/Samples/GDS/Client/Opc.Ua.GdsClient.Config.xml
@@ -21,19 +21,19 @@
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
     <!-- Where the trust list is stored (UA Applications) -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
 
     <!-- WARNING: SHA1 signed certficates are by default rejected and should be phased out. -->
diff --git a/SampleApplications/Samples/GDS/ClientTest/Opc.Ua.GlobalDiscoveryTestClient.Config.xml b/SampleApplications/Samples/GDS/ClientTest/Opc.Ua.GlobalDiscoveryTestClient.Config.xml
index 06218b9f76..183a5010c4 100644
--- a/SampleApplications/Samples/GDS/ClientTest/Opc.Ua.GlobalDiscoveryTestClient.Config.xml
+++ b/SampleApplications/Samples/GDS/ClientTest/Opc.Ua.GlobalDiscoveryTestClient.Config.xml
@@ -12,23 +12,23 @@
   <SecurityConfiguration>
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC/PKI/own</StorePath>
+      <StorePath>%LocalApplicationData%/OPC/pki/own</StorePath>
       <SubjectName>CN=Global Discovery Test Client, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC/PKI/issuers</StorePath>
+      <StorePath>%LocalApplicationData%/OPC/pki/issuers</StorePath>
     </TrustedIssuerCertificates>
 
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC/PKI/trusted</StorePath>
+      <StorePath>%LocalApplicationData%/OPC/pki/trusted</StorePath>
     </TrustedPeerCertificates>
 
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC/PKI/rejected</StorePath>
+      <StorePath>%LocalApplicationData%/OPC/pki/rejected</StorePath>
     </RejectedCertificateStore>
 
     <!-- WARNING: The following setting (to automatically accept untrusted certificates) should be used
diff --git a/SampleApplications/Samples/GDS/ClientTest/Opc.Ua.GlobalDiscoveryTestServer.Config.xml b/SampleApplications/Samples/GDS/ClientTest/Opc.Ua.GlobalDiscoveryTestServer.Config.xml
index 66bd249f69..e521f6c786 100644
--- a/SampleApplications/Samples/GDS/ClientTest/Opc.Ua.GlobalDiscoveryTestServer.Config.xml
+++ b/SampleApplications/Samples/GDS/ClientTest/Opc.Ua.GlobalDiscoveryTestServer.Config.xml
@@ -12,23 +12,23 @@
   <SecurityConfiguration>
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC/GDS/own</StorePath>
+      <StorePath>%LocalApplicationData%/OPC/pki/own</StorePath>
       <SubjectName>CN=Global Discovery Test Server, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC/GDS/issuers</StorePath>
+      <StorePath>%LocalApplicationData%/OPC/pki/issuers</StorePath>
     </TrustedIssuerCertificates>
 
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC/GDS/trusted</StorePath>
+      <StorePath>%LocalApplicationData%/OPC/pki/trusted</StorePath>
     </TrustedPeerCertificates>
 
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC/GDS/rejected</StorePath>
+      <StorePath>%LocalApplicationData%/OPC/pki/rejected</StorePath>
     </RejectedCertificateStore>
 
     <!-- WARNING: The following setting (to automatically accept untrusted certificates) should be used
diff --git a/SampleApplications/Samples/GDS/ClientTest/Opc.Ua.ServerConfigurationPushTestClient.Config.xml b/SampleApplications/Samples/GDS/ClientTest/Opc.Ua.ServerConfigurationPushTestClient.Config.xml
index 61cf16fd85..22884bc23c 100644
--- a/SampleApplications/Samples/GDS/ClientTest/Opc.Ua.ServerConfigurationPushTestClient.Config.xml
+++ b/SampleApplications/Samples/GDS/ClientTest/Opc.Ua.ServerConfigurationPushTestClient.Config.xml
@@ -12,23 +12,23 @@
   <SecurityConfiguration>
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC/PKI/own</StorePath>
+      <StorePath>%LocalApplicationData%/OPC/pki/own</StorePath>
       <SubjectName>CN=Server Configuration Push Test Client, O=OPC Foundation</SubjectName>
     </ApplicationCertificate>
 
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC/PKI/issuers</StorePath>
+      <StorePath>%LocalApplicationData%/OPC/pki/issuers</StorePath>
     </TrustedIssuerCertificates>
 
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC/PKI/trusted</StorePath>
+      <StorePath>%LocalApplicationData%/OPC/pki/trusted</StorePath>
     </TrustedPeerCertificates>
 
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC/PKI/rejected</StorePath>
+      <StorePath>%LocalApplicationData%/OPC/pki/rejected</StorePath>
     </RejectedCertificateStore>
 
     <!-- WARNING: The following setting (to automatically accept untrusted certificates) should be used
diff --git a/SampleApplications/Samples/GDS/ConsoleServer/Opc.Ua.GlobalDiscoveryServer.Config.xml b/SampleApplications/Samples/GDS/ConsoleServer/Opc.Ua.GlobalDiscoveryServer.Config.xml
index c01c75bed6..4581ce40fd 100644
--- a/SampleApplications/Samples/GDS/ConsoleServer/Opc.Ua.GlobalDiscoveryServer.Config.xml
+++ b/SampleApplications/Samples/GDS/ConsoleServer/Opc.Ua.GlobalDiscoveryServer.Config.xml
@@ -12,23 +12,23 @@
   <SecurityConfiguration>
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC Foundation/GDS/PKI/own</StorePath>
+      <StorePath>%LocalApplicationData%/OPC Foundation/GDS/pki/own</StorePath>
       <SubjectName>CN=Global Discovery Server, O=somecompany, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC Foundation/GDS/PKI/issuers</StorePath>
+      <StorePath>%LocalApplicationData%/OPC Foundation/GDS/pki/issuers</StorePath>
     </TrustedIssuerCertificates>
 
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC Foundation/GDS/PKI/trusted</StorePath>
+      <StorePath>%LocalApplicationData%/OPC Foundation/GDS/pki/trusted</StorePath>
     </TrustedPeerCertificates>
 
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC Foundation/GDS/PKI/rejected</StorePath>
+      <StorePath>%LocalApplicationData%/OPC Foundation/GDS/pki/rejected</StorePath>
     </RejectedCertificateStore>
 
     <!-- The GDS server must accept connections from any client -->
diff --git a/SampleApplications/Samples/GDS/Server/Opc.Ua.GlobalDiscoveryServer.Config.xml b/SampleApplications/Samples/GDS/Server/Opc.Ua.GlobalDiscoveryServer.Config.xml
index 3c4e257a78..33f185935e 100644
--- a/SampleApplications/Samples/GDS/Server/Opc.Ua.GlobalDiscoveryServer.Config.xml
+++ b/SampleApplications/Samples/GDS/Server/Opc.Ua.GlobalDiscoveryServer.Config.xml
@@ -12,23 +12,23 @@
   <SecurityConfiguration>
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%/OPC Foundation/GDS/PKI/own</StorePath>
+      <StorePath>%CommonApplicationData%/OPC Foundation/GDS/pki/own</StorePath>
       <SubjectName>CN=Global Discovery Server, O=somecompany, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%/OPC Foundation/GDS/PKI/issuers</StorePath>
+      <StorePath>%CommonApplicationData%/OPC Foundation/GDS/pki/issuers</StorePath>
     </TrustedIssuerCertificates>
 
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%/OPC Foundation/GDS/PKI/trusted</StorePath>
+      <StorePath>%CommonApplicationData%/OPC Foundation/GDS/pki/trusted</StorePath>
     </TrustedPeerCertificates>
 
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%/OPC Foundation/GDS/PKI/rejected</StorePath>
+      <StorePath>%CommonApplicationData%/OPC Foundation/GDS/pki/rejected</StorePath>
     </RejectedCertificateStore>
 
     <!-- The GDS server must accept connections from any client -->
diff --git a/SampleApplications/Samples/NetCoreConsoleClient/Opc.Ua.MonoSampleClient.Config.xml b/SampleApplications/Samples/NetCoreConsoleClient/Opc.Ua.MonoSampleClient.Config.xml
index e12ef0d5d4..05681aa909 100644
--- a/SampleApplications/Samples/NetCoreConsoleClient/Opc.Ua.MonoSampleClient.Config.xml
+++ b/SampleApplications/Samples/NetCoreConsoleClient/Opc.Ua.MonoSampleClient.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>./OPC Foundation/PKI/own</StorePath>
+      <StorePath>./OPC Foundation/pki/own</StorePath>
       <SubjectName>CN=UA Mono Sample Client, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>./OPC Foundation/PKI/issuer</StorePath>
+      <StorePath>./OPC Foundation/pki/issuer</StorePath>
     </TrustedIssuerCertificates>
 
     <!-- Where the trust list is stored (UA Applications) -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>./OPC Foundation/PKI/trusted</StorePath>
+      <StorePath>./OPC Foundation/pki/trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>./OPC Foundation/PKI/rejected</StorePath>
+      <StorePath>./OPC Foundation/pki/rejected</StorePath>
     </RejectedCertificateStore>
 
     <!-- WARNING: The following setting (to automatically accept untrusted certificates) should be used
diff --git a/SampleApplications/Samples/NetCoreConsoleClient/Opc.Ua.SampleClient.Config.xml b/SampleApplications/Samples/NetCoreConsoleClient/Opc.Ua.SampleClient.Config.xml
index 7e8ae6deec..4ac760e3cc 100644
--- a/SampleApplications/Samples/NetCoreConsoleClient/Opc.Ua.SampleClient.Config.xml
+++ b/SampleApplications/Samples/NetCoreConsoleClient/Opc.Ua.SampleClient.Config.xml
@@ -21,19 +21,19 @@
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC Foundation/CertificateStores/UA Certificate Authorities</StorePath>
+      <StorePath>%LocalApplicationData%/OPC Foundation/pki/issuer</StorePath>
     </TrustedIssuerCertificates>
 
     <!-- Where the trust list is stored (UA Applications) -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC Foundation/CertificateStores/UA Applications</StorePath>
+      <StorePath>%LocalApplicationData%/OPC Foundation/pki/trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC Foundation/CertificateStores/RejectedCertificates</StorePath>
+      <StorePath>%LocalApplicationData%/OPC Foundation/pki/rejected</StorePath>
     </RejectedCertificateStore>
 
     <!-- WARNING: The following setting (to automatically accept untrusted certificates) should be used
diff --git a/SampleApplications/Samples/NetCoreConsoleServer/Opc.Ua.MonoSampleServer.Config.xml b/SampleApplications/Samples/NetCoreConsoleServer/Opc.Ua.MonoSampleServer.Config.xml
index 0cfc2a0ae3..8c498d6a30 100644
--- a/SampleApplications/Samples/NetCoreConsoleServer/Opc.Ua.MonoSampleServer.Config.xml
+++ b/SampleApplications/Samples/NetCoreConsoleServer/Opc.Ua.MonoSampleServer.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>./OPC Foundation/PKI/own</StorePath>
+      <StorePath>./OPC Foundation/pki/own</StorePath>
       <SubjectName>CN=UA Mono Sample Server, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>./OPC Foundation/PKI/issuer</StorePath>
+      <StorePath>./OPC Foundation/pki/issuer</StorePath>
     </TrustedIssuerCertificates>
     
     <!-- Where the trust list is stored (UA Applications) -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>./OPC Foundation/PKI/trusted</StorePath>
+      <StorePath>./OPC Foundation/pki/trusted</StorePath>
     </TrustedPeerCertificates>
     
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>./OPC Foundation/PKI/rejected</StorePath>
+      <StorePath>./OPC Foundation/pki/rejected</StorePath>
     </RejectedCertificateStore>
 
     <!-- WARNING: The following setting (to automatically accept untrusted certificates) should be used
diff --git a/SampleApplications/Samples/NetCoreConsoleServer/Opc.Ua.SampleServer.Config.xml b/SampleApplications/Samples/NetCoreConsoleServer/Opc.Ua.SampleServer.Config.xml
index be9e3334f6..d836b398b3 100644
--- a/SampleApplications/Samples/NetCoreConsoleServer/Opc.Ua.SampleServer.Config.xml
+++ b/SampleApplications/Samples/NetCoreConsoleServer/Opc.Ua.SampleServer.Config.xml
@@ -21,19 +21,19 @@
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC Foundation/CertificateStores/UA Certificate Authorities</StorePath>
+      <StorePath>%LocalApplicationData%/OPC Foundation/pki/issuer</StorePath>
     </TrustedIssuerCertificates>
 
     <!-- Where the trust list is stored (UA Applications) -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC Foundation/CertificateStores/UA Applications</StorePath>
+      <StorePath>%LocalApplicationData%/OPC Foundation/pki/trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC Foundation/CertificateStores/RejectedCertificates</StorePath>
+      <StorePath>%LocalApplicationData%/OPC Foundation/pki/rejected</StorePath>
     </RejectedCertificateStore>
 
     <!-- WARNING: The following setting (to automatically accept untrusted certificates) should be used
diff --git a/SampleApplications/Samples/Server.Net4/Opc.Ua.SampleServer.Config.xml b/SampleApplications/Samples/Server.Net4/Opc.Ua.SampleServer.Config.xml
index dd52a360a7..e450f79da9 100644
--- a/SampleApplications/Samples/Server.Net4/Opc.Ua.SampleServer.Config.xml
+++ b/SampleApplications/Samples/Server.Net4/Opc.Ua.SampleServer.Config.xml
@@ -21,19 +21,19 @@
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
     
     <!-- Where the trust list is stored (UA Applications) -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
 
     <!-- Where the User issuer certificates are stored -->
diff --git a/SampleApplications/Samples/Server/Opc.Ua.SampleServer.Config.xml b/SampleApplications/Samples/Server/Opc.Ua.SampleServer.Config.xml
index f55f154328..43b6d05238 100644
--- a/SampleApplications/Samples/Server/Opc.Ua.SampleServer.Config.xml
+++ b/SampleApplications/Samples/Server/Opc.Ua.SampleServer.Config.xml
@@ -21,19 +21,19 @@
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalFolder%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%LocalFolder%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
     
     <!-- Where the trust list is stored (UA Applications) -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalFolder%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%LocalFolder%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
     
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalFolder%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%LocalFolder%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
 
   </SecurityConfiguration>
diff --git a/SampleApplications/Samples/XamarinClient/XamarinClient.Android/Assets/Opc.Ua.SampleClient.Config.xml b/SampleApplications/Samples/XamarinClient/XamarinClient.Android/Assets/Opc.Ua.SampleClient.Config.xml
index 5cdb371c22..1254894f8b 100644
--- a/SampleApplications/Samples/XamarinClient/XamarinClient.Android/Assets/Opc.Ua.SampleClient.Config.xml
+++ b/SampleApplications/Samples/XamarinClient/XamarinClient.Android/Assets/Opc.Ua.SampleClient.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>/storage/emulated/0/OPC Foundation/PKI/own</StorePath>
+      <StorePath>/storage/emulated/0/OPC Foundation/pki/own</StorePath>
       <SubjectName>CN=UA Xamarin Sample Client, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>/storage/emulated/0/OPC Foundation/PKI/issuer</StorePath>
+      <StorePath>/storage/emulated/0/OPC Foundation/pki/issuer</StorePath>
     </TrustedIssuerCertificates>
 
     <!-- Where the trust list is stored (UA Applications) -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>/storage/emulated/0/OPC Foundation/PKI/trusted</StorePath>
+      <StorePath>/storage/emulated/0/OPC Foundation/pki/trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>/storage/emulated/0/OPC Foundation/PKI/rejected</StorePath>
+      <StorePath>/storage/emulated/0/OPC Foundation/pki/rejected</StorePath>
     </RejectedCertificateStore>
 
     <!-- WARNING: The following setting (to automatically accept untrusted certificates) should be used
diff --git a/SampleApplications/Samples/XamarinClient/XamarinClient.UWP/Opc.Ua.SampleClient.Config.xml b/SampleApplications/Samples/XamarinClient/XamarinClient.UWP/Opc.Ua.SampleClient.Config.xml
index 5be6ff31a1..bae1e7dde4 100644
--- a/SampleApplications/Samples/XamarinClient/XamarinClient.UWP/Opc.Ua.SampleClient.Config.xml
+++ b/SampleApplications/Samples/XamarinClient/XamarinClient.UWP/Opc.Ua.SampleClient.Config.xml
@@ -21,19 +21,19 @@
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC Foundation/PKI/issuer</StorePath>
+      <StorePath>%LocalApplicationData%/OPC Foundation/pki/issuer</StorePath>
     </TrustedIssuerCertificates>
 
     <!-- Where the trust list is stored (UA Applications) -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC Foundation/PKI/trusted</StorePath>
+      <StorePath>%LocalApplicationData%/OPC Foundation/pki/trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC Foundation/PKI/rejected</StorePath>
+      <StorePath>%LocalApplicationData%/OPC Foundation/pki/rejected</StorePath>
     </RejectedCertificateStore>
 
     <!-- WARNING: The following setting (to automatically accept untrusted certificates) should be used
diff --git a/SampleApplications/Samples/XamarinClient/XamarinClient.iOS/Opc.Ua.SampleClient.Config.xml b/SampleApplications/Samples/XamarinClient/XamarinClient.iOS/Opc.Ua.SampleClient.Config.xml
index 4354e74835..2b68574180 100644
--- a/SampleApplications/Samples/XamarinClient/XamarinClient.iOS/Opc.Ua.SampleClient.Config.xml
+++ b/SampleApplications/Samples/XamarinClient/XamarinClient.iOS/Opc.Ua.SampleClient.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>./OPC Foundation/PKI/own</StorePath>
+      <StorePath>./OPC Foundation/pki/own</StorePath>
       <SubjectName>CN=UA Xamarin Sample Client, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>./OPC Foundation/PKI/issuer</StorePath>
+      <StorePath>./OPC Foundation/pki/issuer</StorePath>
     </TrustedIssuerCertificates>
 
     <!-- Where the trust list is stored (UA Applications) -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>./OPC Foundation/PKI/trusted</StorePath>
+      <StorePath>./OPC Foundation/pki/trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>./OPC Foundation/PKI/rejected</StorePath>
+      <StorePath>./OPC Foundation/pki/rejected</StorePath>
     </RejectedCertificateStore>
 
     <!-- WARNING: The following setting (to automatically accept untrusted certificates) should be used
diff --git a/SampleApplications/Workshop/Aggregation/Client/Quickstarts.AggregationClient.Config.xml b/SampleApplications/Workshop/Aggregation/Client/Quickstarts.AggregationClient.Config.xml
index 2574cb99db..31b534b4d3 100644
--- a/SampleApplications/Workshop/Aggregation/Client/Quickstarts.AggregationClient.Config.xml
+++ b/SampleApplications/Workshop/Aggregation/Client/Quickstarts.AggregationClient.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart Aggregation Client, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
-    <!-- Where the issuer certificate are stored (certificate authorities) -->
+   <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
-    <!-- Where the trust list is stored (UA Applications) -->
+    <!-- Where the trust list is stored -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
-        <!-- The directory used to store invalid certficates for later review by the administrator. -->
+    <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
   </SecurityConfiguration>
   
diff --git a/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/Quickstarts.AggregationServer.Config.xml b/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/Quickstarts.AggregationServer.Config.xml
index 05b9161e8e..b17e49b6e2 100644
--- a/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/Quickstarts.AggregationServer.Config.xml
+++ b/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/Quickstarts.AggregationServer.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>OPC Foundation/CertificateStores/MachineDefault</StorePath>
+      <StorePath>OPC Foundation/pki/own</StorePath>
       <SubjectName>CN=Quickstart Aggregation Server, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>OPC Foundation/CertificateStores/UA Certificate Authorities</StorePath>
+      <StorePath>OPC Foundation/pki/issuer</StorePath>
     </TrustedIssuerCertificates>
 
     <!-- Where the trust list is stored (UA Applications) -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>OPC Foundation/CertificateStores/UA Applications</StorePath>
+      <StorePath>OPC Foundation/pki/trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>OPC Foundation/CertificateStores/RejectedCertificates</StorePath>
+      <StorePath>OPC Foundation/pki/rejected</StorePath>
     </RejectedCertificateStore>
 
     <!-- WARNING: The following setting (to automatically accept untrusted certificates) should be used
diff --git a/SampleApplications/Workshop/Aggregation/Server/Quickstarts.AggregationServer.Config.xml b/SampleApplications/Workshop/Aggregation/Server/Quickstarts.AggregationServer.Config.xml
index 299b078743..79ec514097 100644
--- a/SampleApplications/Workshop/Aggregation/Server/Quickstarts.AggregationServer.Config.xml
+++ b/SampleApplications/Workshop/Aggregation/Server/Quickstarts.AggregationServer.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart Aggregation Server, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
     <!-- Where the trust list is stored (UA Applications) -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
 
   </SecurityConfiguration>
diff --git a/SampleApplications/Workshop/AlarmCondition/Client/AlarmConditionClient.Config.xml b/SampleApplications/Workshop/AlarmCondition/Client/AlarmConditionClient.Config.xml
index efe38ade70..98dae584b2 100644
--- a/SampleApplications/Workshop/AlarmCondition/Client/AlarmConditionClient.Config.xml
+++ b/SampleApplications/Workshop/AlarmCondition/Client/AlarmConditionClient.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart AlarmCondition Client, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
     <!-- Where the trust list is stored (UA Applications) -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
   </SecurityConfiguration>
   
diff --git a/SampleApplications/Workshop/AlarmCondition/Server/AlarmConditionServer.Config.xml b/SampleApplications/Workshop/AlarmCondition/Server/AlarmConditionServer.Config.xml
index e1cf7efe77..6ed204bce0 100644
--- a/SampleApplications/Workshop/AlarmCondition/Server/AlarmConditionServer.Config.xml
+++ b/SampleApplications/Workshop/AlarmCondition/Server/AlarmConditionServer.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart AlarmCondition Server, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
     <!-- Where the trust list is stored (UA Applications) -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
   </SecurityConfiguration>
 
diff --git a/SampleApplications/Workshop/Boiler/Client/BoilerClient.Config.xml b/SampleApplications/Workshop/Boiler/Client/BoilerClient.Config.xml
index a317277b3d..219b963616 100644
--- a/SampleApplications/Workshop/Boiler/Client/BoilerClient.Config.xml
+++ b/SampleApplications/Workshop/Boiler/Client/BoilerClient.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart InformationModel Client, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
     <!-- Where the trust list is stored (UA Applications) -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
   </SecurityConfiguration>
   
diff --git a/SampleApplications/Workshop/Boiler/Server/BoilerServer.Config.xml b/SampleApplications/Workshop/Boiler/Server/BoilerServer.Config.xml
index 39543d1a95..321b719450 100644
--- a/SampleApplications/Workshop/Boiler/Server/BoilerServer.Config.xml
+++ b/SampleApplications/Workshop/Boiler/Server/BoilerServer.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart InformationModel Server, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
     <!-- Where the trust list is stored (UA Applications) -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
   </SecurityConfiguration>
   
diff --git a/SampleApplications/Workshop/DataAccess/Client/DataAccessClient.Config.xml b/SampleApplications/Workshop/DataAccess/Client/DataAccessClient.Config.xml
index 1e466cc9ba..829a1540d7 100644
--- a/SampleApplications/Workshop/DataAccess/Client/DataAccessClient.Config.xml
+++ b/SampleApplications/Workshop/DataAccess/Client/DataAccessClient.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart DataAccess Client, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
     <!-- Where the trust list is stored (UA Applications) -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
   </SecurityConfiguration>
   
diff --git a/SampleApplications/Workshop/DataAccess/Server/DataAccessServer.Config.xml b/SampleApplications/Workshop/DataAccess/Server/DataAccessServer.Config.xml
index 4e5cc267c8..f3733a01e2 100644
--- a/SampleApplications/Workshop/DataAccess/Server/DataAccessServer.Config.xml
+++ b/SampleApplications/Workshop/DataAccess/Server/DataAccessServer.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart DataAccess Server, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
     <!-- Where the trust list is stored (UA Applications) -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
   </SecurityConfiguration>
   
diff --git a/SampleApplications/Workshop/DataTypes/Client/DataTypesClient.Config.xml b/SampleApplications/Workshop/DataTypes/Client/DataTypesClient.Config.xml
index bd9820cd76..eb8061b3d3 100644
--- a/SampleApplications/Workshop/DataTypes/Client/DataTypesClient.Config.xml
+++ b/SampleApplications/Workshop/DataTypes/Client/DataTypesClient.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart DataTypes Client, C=US, S=Arizona, O=SomeCompany, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
-    <!-- Where the issuer certificate are stored (certificate authorities) -->
+   <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
-    <!-- Where the trust list is stored (UA Applications) -->
+    <!-- Where the trust list is stored -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
   </SecurityConfiguration>
   
diff --git a/SampleApplications/Workshop/DataTypes/Server/DataTypesServer.Config.xml b/SampleApplications/Workshop/DataTypes/Server/DataTypesServer.Config.xml
index 611a02b3dd..2a141223f8 100644
--- a/SampleApplications/Workshop/DataTypes/Server/DataTypesServer.Config.xml
+++ b/SampleApplications/Workshop/DataTypes/Server/DataTypesServer.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart DataTypes Server, C=US, S=Arizona, O=SomeCompany, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
-    <!-- Where the trust list is stored (UA Applications) -->
+    <!-- Where the trust list is stored -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
   </SecurityConfiguration>
   
diff --git a/SampleApplications/Workshop/Empty/Client/Quickstarts.EmptyClient.Config.xml b/SampleApplications/Workshop/Empty/Client/Quickstarts.EmptyClient.Config.xml
index 0783b92153..6ab2c0d887 100644
--- a/SampleApplications/Workshop/Empty/Client/Quickstarts.EmptyClient.Config.xml
+++ b/SampleApplications/Workshop/Empty/Client/Quickstarts.EmptyClient.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart Empty Client, C=US, S=Arizona, O=SomeCompany, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
-    <!-- Where the issuer certificate are stored (certificate authorities) -->
+   <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
-    <!-- Where the trust list is stored (UA Applications) -->
+    <!-- Where the trust list is stored -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
   </SecurityConfiguration>
   
diff --git a/SampleApplications/Workshop/Empty/Server/Quickstarts.EmptyServer.Config.xml b/SampleApplications/Workshop/Empty/Server/Quickstarts.EmptyServer.Config.xml
index 75e8a3a5ab..286eeeb5eb 100644
--- a/SampleApplications/Workshop/Empty/Server/Quickstarts.EmptyServer.Config.xml
+++ b/SampleApplications/Workshop/Empty/Server/Quickstarts.EmptyServer.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart Empty Server, C=US, S=Arizona, O=SomeCompany, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
-    <!-- Where the trust list is stored (UA Applications) -->
+    <!-- Where the trust list is stored -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
   </SecurityConfiguration>
   
diff --git a/SampleApplications/Workshop/HistoricalAccess/Client/HistoricalAccessClient.Config.xml b/SampleApplications/Workshop/HistoricalAccess/Client/HistoricalAccessClient.Config.xml
index f12cf9aab8..bf14963d4d 100644
--- a/SampleApplications/Workshop/HistoricalAccess/Client/HistoricalAccessClient.Config.xml
+++ b/SampleApplications/Workshop/HistoricalAccess/Client/HistoricalAccessClient.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart HistoricalAccess Client, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
-    <!-- Where the trust list is stored (UA Applications) -->
+    <!-- Where the trust list is stored -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
   </SecurityConfiguration>
   
diff --git a/SampleApplications/Workshop/HistoricalAccess/Server/HistoricalAccessServer.Config.xml b/SampleApplications/Workshop/HistoricalAccess/Server/HistoricalAccessServer.Config.xml
index 8ff45f837c..6da9f1cef3 100644
--- a/SampleApplications/Workshop/HistoricalAccess/Server/HistoricalAccessServer.Config.xml
+++ b/SampleApplications/Workshop/HistoricalAccess/Server/HistoricalAccessServer.Config.xml
@@ -14,28 +14,27 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart HistoricalAccess Server, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
-    <!-- Where the trust list is stored (UA Applications) -->
+    <!-- Where the trust list is stored -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
-
   </SecurityConfiguration>
   
   <TransportConfigurations></TransportConfigurations>
diff --git a/SampleApplications/Workshop/HistoricalEvents/Client/HistoricalEventsClient.Config.xml b/SampleApplications/Workshop/HistoricalEvents/Client/HistoricalEventsClient.Config.xml
index 0269941bc3..9d645f8767 100644
--- a/SampleApplications/Workshop/HistoricalEvents/Client/HistoricalEventsClient.Config.xml
+++ b/SampleApplications/Workshop/HistoricalEvents/Client/HistoricalEventsClient.Config.xml
@@ -14,28 +14,27 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart HistoricalEvents Client, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
-    <!-- Where the trust list is stored (UA Applications) -->
+    <!-- Where the trust list is stored -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
-
   </SecurityConfiguration>
   
   <TransportConfigurations></TransportConfigurations>
diff --git a/SampleApplications/Workshop/HistoricalEvents/Server/HistoricalEventsServer.Config.xml b/SampleApplications/Workshop/HistoricalEvents/Server/HistoricalEventsServer.Config.xml
index 80f478583e..1d1fad54df 100644
--- a/SampleApplications/Workshop/HistoricalEvents/Server/HistoricalEventsServer.Config.xml
+++ b/SampleApplications/Workshop/HistoricalEvents/Server/HistoricalEventsServer.Config.xml
@@ -14,28 +14,27 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart HistoricalEvents Server, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
-    <!-- Where the trust list is stored (UA Applications) -->
+    <!-- Where the trust list is stored -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
-
   </SecurityConfiguration>
   
   <TransportConfigurations></TransportConfigurations>
diff --git a/SampleApplications/Workshop/Methods/Client/Quickstarts.MethodsClient.Config.xml b/SampleApplications/Workshop/Methods/Client/Quickstarts.MethodsClient.Config.xml
index c490a4910f..030f8269f7 100644
--- a/SampleApplications/Workshop/Methods/Client/Quickstarts.MethodsClient.Config.xml
+++ b/SampleApplications/Workshop/Methods/Client/Quickstarts.MethodsClient.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart Methods Client, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
-    <!-- Where the issuer certificate are stored (certificate authorities) -->
+   <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
-    <!-- Where the trust list is stored (UA Applications) -->
+    <!-- Where the trust list is stored -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
   </SecurityConfiguration>
   
diff --git a/SampleApplications/Workshop/Methods/Server/Quickstarts.MethodsServer.Config.xml b/SampleApplications/Workshop/Methods/Server/Quickstarts.MethodsServer.Config.xml
index 9305efc80b..59eae146df 100644
--- a/SampleApplications/Workshop/Methods/Server/Quickstarts.MethodsServer.Config.xml
+++ b/SampleApplications/Workshop/Methods/Server/Quickstarts.MethodsServer.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart Methods Server, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
-    <!-- Where the trust list is stored (UA Applications) -->
+    <!-- Where the trust list is stored -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
   </SecurityConfiguration>
   
diff --git a/SampleApplications/Workshop/PerfTest/Client/PerfTestClient.Config.xml b/SampleApplications/Workshop/PerfTest/Client/PerfTestClient.Config.xml
index f3232845e2..d0aa8625fa 100644
--- a/SampleApplications/Workshop/PerfTest/Client/PerfTestClient.Config.xml
+++ b/SampleApplications/Workshop/PerfTest/Client/PerfTestClient.Config.xml
@@ -12,26 +12,26 @@
   <SecurityConfiguration>
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart PerfTest Client, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
-    
-    <!-- Where the trust list is stored (UA Applications) -->
+
+    <!-- Where the trust list is stored -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
   </SecurityConfiguration>
   
diff --git a/SampleApplications/Workshop/PerfTest/Server/PerfTestServer.Config.xml b/SampleApplications/Workshop/PerfTest/Server/PerfTestServer.Config.xml
index dd65ce2b97..c09bf3ee67 100644
--- a/SampleApplications/Workshop/PerfTest/Server/PerfTestServer.Config.xml
+++ b/SampleApplications/Workshop/PerfTest/Server/PerfTestServer.Config.xml
@@ -12,28 +12,27 @@
   <SecurityConfiguration>
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart PerfTest Server, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
-    <!-- Where the trust list is stored (UA Applications) -->
+    <!-- Where the trust list is stored -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
-    </RejectedCertificateStore>
-    
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
+    </RejectedCertificateStore>    
   </SecurityConfiguration>
  
   <TransportConfigurations></TransportConfigurations>
diff --git a/SampleApplications/Workshop/Reference/Client/Quickstarts.ReferenceClient.Config.xml b/SampleApplications/Workshop/Reference/Client/Quickstarts.ReferenceClient.Config.xml
index b348f8e44f..ec7011e773 100644
--- a/SampleApplications/Workshop/Reference/Client/Quickstarts.ReferenceClient.Config.xml
+++ b/SampleApplications/Workshop/Reference/Client/Quickstarts.ReferenceClient.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart Reference Client, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
-    <!-- Where the issuer certificate are stored (certificate authorities) -->
+   <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
-    <!-- Where the trust list is stored (UA Applications) -->
+    <!-- Where the trust list is stored -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
 
     <!-- WARNING: The following setting (to automatically accept untrusted certificates) should be used
diff --git a/SampleApplications/Workshop/Reference/ConsoleReferenceServer/Quickstarts.MonoReferenceServer.Config.xml b/SampleApplications/Workshop/Reference/ConsoleReferenceServer/Quickstarts.MonoReferenceServer.Config.xml
index 40bdd44cd9..c9d92f3be2 100644
--- a/SampleApplications/Workshop/Reference/ConsoleReferenceServer/Quickstarts.MonoReferenceServer.Config.xml
+++ b/SampleApplications/Workshop/Reference/ConsoleReferenceServer/Quickstarts.MonoReferenceServer.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>./OPC Foundation/PKI/own</StorePath>
+      <StorePath>./OPC Foundation/pki/own</StorePath>
       <SubjectName>CN=Quickstart Mono Reference Server, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>./OPC Foundation/PKI/issuer</StorePath>
+      <StorePath>./OPC Foundation/pki/issuer</StorePath>
     </TrustedIssuerCertificates>
 
     <!-- Where the trust list is stored (UA Applications) -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>./OPC Foundation/PKI/trusted</StorePath>
+      <StorePath>./OPC Foundation/pki/trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>./OPC Foundation/PKI/rejected</StorePath>
+      <StorePath>./OPC Foundation/pki/rejected</StorePath>
     </RejectedCertificateStore>
 
     <!-- WARNING: The following setting (to automatically accept untrusted certificates) should be used
diff --git a/SampleApplications/Workshop/Reference/ConsoleReferenceServer/Quickstarts.ReferenceServer.Config.xml b/SampleApplications/Workshop/Reference/ConsoleReferenceServer/Quickstarts.ReferenceServer.Config.xml
index b3f81cfb23..d06c800860 100644
--- a/SampleApplications/Workshop/Reference/ConsoleReferenceServer/Quickstarts.ReferenceServer.Config.xml
+++ b/SampleApplications/Workshop/Reference/ConsoleReferenceServer/Quickstarts.ReferenceServer.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC Foundation/CertificateStores/MachineDefault</StorePath>
+      <StorePath>%LocalApplicationData%/OPC Foundation/pki/own</StorePath>
       <SubjectName>CN=Quickstart Reference Server, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC Foundation/CertificateStores/UA Certificate Authorities</StorePath>
+      <StorePath>%LocalApplicationData%/OPC Foundation/pki/issuer</StorePath>
     </TrustedIssuerCertificates>
 
     <!-- Where the trust list is stored (UA Applications) -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC Foundation/CertificateStores/UA Applications</StorePath>
+      <StorePath>%LocalApplicationData%/OPC Foundation/pki/trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%LocalApplicationData%/OPC Foundation/CertificateStores/RejectedCertificates</StorePath>
+      <StorePath>%LocalApplicationData%/OPC Foundation/pki/rejected</StorePath>
     </RejectedCertificateStore>
 
     <!-- WARNING: The following setting (to automatically accept untrusted certificates) should be used
diff --git a/SampleApplications/Workshop/Reference/Server/Quickstarts.ReferenceServer.Config.xml b/SampleApplications/Workshop/Reference/Server/Quickstarts.ReferenceServer.Config.xml
index 814a9b6035..893edadf61 100644
--- a/SampleApplications/Workshop/Reference/Server/Quickstarts.ReferenceServer.Config.xml
+++ b/SampleApplications/Workshop/Reference/Server/Quickstarts.ReferenceServer.Config.xml
@@ -11,29 +11,29 @@
   
   <SecurityConfiguration>
 
-    <!-- Where the application instance certificate is stored (MachineDefault) -->
+    <!-- Where the application instance certificate is stored-->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart Reference Server, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
-    <!-- Where the trust list is stored (UA Applications) -->
+    <!-- Where the trust list is stored -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
 
     <!-- WARNING: The following setting (to automatically accept untrusted certificates) should be used
diff --git a/SampleApplications/Workshop/SimpleEvents/Client/SimpleEventsClient.Config.xml b/SampleApplications/Workshop/SimpleEvents/Client/SimpleEventsClient.Config.xml
index 3395d6a20d..c86996b909 100644
--- a/SampleApplications/Workshop/SimpleEvents/Client/SimpleEventsClient.Config.xml
+++ b/SampleApplications/Workshop/SimpleEvents/Client/SimpleEventsClient.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart SimpleEvents Client, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
-    <!-- Where the trust list is stored (UA Applications) -->
+    <!-- Where the trust list is stored -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
   </SecurityConfiguration>
   
diff --git a/SampleApplications/Workshop/SimpleEvents/Server/SimpleEventsServer.Config.xml b/SampleApplications/Workshop/SimpleEvents/Server/SimpleEventsServer.Config.xml
index 78fca0930f..bc1e23c761 100644
--- a/SampleApplications/Workshop/SimpleEvents/Server/SimpleEventsServer.Config.xml
+++ b/SampleApplications/Workshop/SimpleEvents/Server/SimpleEventsServer.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart SimpleEvents Server, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
-    <!-- Where the issuer certificate are stored (certificate authorities) -->
+   <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
-    <!-- Where the trust list is stored (UA Applications) -->
+    <!-- Where the trust list is stored -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
   </SecurityConfiguration>
   
diff --git a/SampleApplications/Workshop/UserAuthentication/Client/Quickstarts.UserAuthenticationClient.Config.xml b/SampleApplications/Workshop/UserAuthentication/Client/Quickstarts.UserAuthenticationClient.Config.xml
index fe34645ba8..4cf9f0c3b9 100644
--- a/SampleApplications/Workshop/UserAuthentication/Client/Quickstarts.UserAuthenticationClient.Config.xml
+++ b/SampleApplications/Workshop/UserAuthentication/Client/Quickstarts.UserAuthenticationClient.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart UserAuthentication Client, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
-    <!-- Where the trust list is stored (UA Applications) -->
+    <!-- Where the trust list is stored -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
   </SecurityConfiguration>
   
diff --git a/SampleApplications/Workshop/UserAuthentication/Server/Quickstarts.UserAuthenticationServer.Config.xml b/SampleApplications/Workshop/UserAuthentication/Server/Quickstarts.UserAuthenticationServer.Config.xml
index afa167b24d..ade60a4259 100644
--- a/SampleApplications/Workshop/UserAuthentication/Server/Quickstarts.UserAuthenticationServer.Config.xml
+++ b/SampleApplications/Workshop/UserAuthentication/Server/Quickstarts.UserAuthenticationServer.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart UserAuthentication Server, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
-    <!-- Where the trust list is stored (UA Applications) -->
+    <!-- Where the trust list is stored -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
   </SecurityConfiguration>
   
diff --git a/SampleApplications/Workshop/Views/Client/Quickstarts.ViewsClient.Config.xml b/SampleApplications/Workshop/Views/Client/Quickstarts.ViewsClient.Config.xml
index f061806c98..a37d84b111 100644
--- a/SampleApplications/Workshop/Views/Client/Quickstarts.ViewsClient.Config.xml
+++ b/SampleApplications/Workshop/Views/Client/Quickstarts.ViewsClient.Config.xml
@@ -14,28 +14,27 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart Views Client, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
-    <!-- Where the trust list is stored (UA Applications) -->
+    <!-- Where the trust list is stored -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
-    </RejectedCertificateStore>
-  
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
+    </RejectedCertificateStore>  
   </SecurityConfiguration>
   
   <TransportConfigurations></TransportConfigurations>
diff --git a/SampleApplications/Workshop/Views/Server/Quickstarts.ViewsServer.Config.xml b/SampleApplications/Workshop/Views/Server/Quickstarts.ViewsServer.Config.xml
index aae199941a..1f54b27bbf 100644
--- a/SampleApplications/Workshop/Views/Server/Quickstarts.ViewsServer.Config.xml
+++ b/SampleApplications/Workshop/Views/Server/Quickstarts.ViewsServer.Config.xml
@@ -14,26 +14,26 @@
     <!-- Where the application instance certificate is stored (MachineDefault) -->
     <ApplicationCertificate>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\MachineDefault</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\own</StorePath>
       <SubjectName>CN=Quickstart Views Server, C=US, S=Arizona, O=OPC Foundation, DC=localhost</SubjectName>
     </ApplicationCertificate>
 
     <!-- Where the issuer certificate are stored (certificate authorities) -->
     <TrustedIssuerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Certificate Authorities</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\issuer</StorePath>
     </TrustedIssuerCertificates>
 
-    <!-- Where the trust list is stored (UA Applications) -->
+    <!-- Where the trust list is stored -->
     <TrustedPeerCertificates>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\UA Applications</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\trusted</StorePath>
     </TrustedPeerCertificates>
 
     <!-- The directory used to store invalid certficates for later review by the administrator. -->
     <RejectedCertificateStore>
       <StoreType>Directory</StoreType>
-      <StorePath>%CommonApplicationData%\OPC Foundation\CertificateStores\RejectedCertificates</StorePath>
+      <StorePath>%CommonApplicationData%\OPC Foundation\pki\rejected</StorePath>
     </RejectedCertificateStore>
   </SecurityConfiguration>