diff --git a/Applications/ClientControls.Net4/Configuration/CertificateListCtrl.cs b/Applications/ClientControls.Net4/Configuration/CertificateListCtrl.cs
index eb27ee3b05..364464771e 100644
--- a/Applications/ClientControls.Net4/Configuration/CertificateListCtrl.cs
+++ b/Applications/ClientControls.Net4/Configuration/CertificateListCtrl.cs
@@ -351,7 +351,7 @@ protected override void UpdateItem(ListViewItem listItem, object item)
                 }
 
                 // look up domains.
-                IList<string> domains = X509Utils.GetDomainsFromCertficate(certificate);
+                IList<string> domains = X509Utils.GetDomainsFromCertificate(certificate);
 
                 StringBuilder buffer = new StringBuilder();
 
diff --git a/Applications/ClientControls.Net4/Configuration/CertificateListFilter.cs b/Applications/ClientControls.Net4/Configuration/CertificateListFilter.cs
index 35ec3f01be..96c99d0f1d 100644
--- a/Applications/ClientControls.Net4/Configuration/CertificateListFilter.cs
+++ b/Applications/ClientControls.Net4/Configuration/CertificateListFilter.cs
@@ -125,7 +125,7 @@ public bool Match(X509Certificate2 certificate)
 
                 if (!String.IsNullOrEmpty(m_domain))
                 {
-                    IList<string> domains = X509Utils.GetDomainsFromCertficate(certificate);
+                    IList<string> domains = X509Utils.GetDomainsFromCertificate(certificate);
 
                     bool found = false;
 
diff --git a/Applications/ClientControls.Net4/Configuration/Common (OLD)/GuiUtils.cs b/Applications/ClientControls.Net4/Configuration/Common (OLD)/GuiUtils.cs
index 254c556027..b05baab3a5 100644
--- a/Applications/ClientControls.Net4/Configuration/Common (OLD)/GuiUtils.cs	
+++ b/Applications/ClientControls.Net4/Configuration/Common (OLD)/GuiUtils.cs	
@@ -263,7 +263,7 @@ public static bool HandleDomainCheckError(string caption, ServiceResult serviceR
                 buffer.AppendFormat("Valid From: {0}\r\n", certificate.NotBefore);
                 buffer.AppendFormat("Valid To: {0}\r\n", certificate.NotAfter);
                 buffer.AppendFormat("Thumbprint: {0}\r\n\r\n", certificate.Thumbprint);
-                var domains = X509Utils.GetDomainsFromCertficate(certificate);
+                var domains = X509Utils.GetDomainsFromCertificate(certificate);
                 if (domains.Count > 0)
                 {
                     bool comma = false;
diff --git a/Applications/ClientControls.Net4/Configuration/ViewCertificateDlg.cs b/Applications/ClientControls.Net4/Configuration/ViewCertificateDlg.cs
index a39c19c98f..37866d3258 100644
--- a/Applications/ClientControls.Net4/Configuration/ViewCertificateDlg.cs
+++ b/Applications/ClientControls.Net4/Configuration/ViewCertificateDlg.cs
@@ -148,7 +148,7 @@ public async Task<bool> ShowDialog(CertificateIdentifier certificate)
                     // fill in domains.
                     buffer = new StringBuilder();
 
-                    foreach (string domain in X509Utils.GetDomainsFromCertficate(data))
+                    foreach (string domain in X509Utils.GetDomainsFromCertificate(data))
                     {
                         if (buffer.Length > 0)
                         {
diff --git a/Applications/ClientControls.Net4/Endpoints/ConfiguredServerDlg.cs b/Applications/ClientControls.Net4/Endpoints/ConfiguredServerDlg.cs
index ee6a90ca1e..c4d21b5068 100644
--- a/Applications/ClientControls.Net4/Endpoints/ConfiguredServerDlg.cs
+++ b/Applications/ClientControls.Net4/Endpoints/ConfiguredServerDlg.cs
@@ -329,7 +329,7 @@ private void BuildEndpointDescription()
         #endregion
 
         #region Public Interface
-        public EndpointDescriptionCollection AvailableEnpoints
+        public EndpointDescriptionCollection AvailableEndpoints
         {
             get { return m_availableEndpoints; }
         }
diff --git a/Libraries/Opc.Ua.Configuration/ApplicationInstance.cs b/Libraries/Opc.Ua.Configuration/ApplicationInstance.cs
index 3f2ce81710..da509a13e0 100644
--- a/Libraries/Opc.Ua.Configuration/ApplicationInstance.cs
+++ b/Libraries/Opc.Ua.Configuration/ApplicationInstance.cs
@@ -709,7 +709,7 @@ private static async Task<bool> CheckDomainsInCertificateAsync(
 
             bool valid = true;
             IList<string> serverDomainNames = configuration.GetServerDomainNames();
-            IList<string> certificateDomainNames = X509Utils.GetDomainsFromCertficate(certificate);
+            IList<string> certificateDomainNames = X509Utils.GetDomainsFromCertificate(certificate);
 
             Utils.LogInfo("Server Domain names:");
             foreach (var name in serverDomainNames)
diff --git a/Libraries/Opc.Ua.Gds.Client.Common/CertificateWrapper.cs b/Libraries/Opc.Ua.Gds.Client.Common/CertificateWrapper.cs
index d18b8a1388..4d929cb0f8 100644
--- a/Libraries/Opc.Ua.Gds.Client.Common/CertificateWrapper.cs
+++ b/Libraries/Opc.Ua.Gds.Client.Common/CertificateWrapper.cs
@@ -236,7 +236,7 @@ public IList<string> Domains
                 {
                     try
                     {
-                        return X509Utils.GetDomainsFromCertficate(Certificate);
+                        return X509Utils.GetDomainsFromCertificate(Certificate);
                     }
                     catch (Exception e)
                     {
diff --git a/Libraries/Opc.Ua.Gds.Client.Common/RegisteredApplicationExtensions.cs b/Libraries/Opc.Ua.Gds.Client.Common/RegisteredApplicationExtensions.cs
index aaf6974d7a..bc850ef248 100644
--- a/Libraries/Opc.Ua.Gds.Client.Common/RegisteredApplicationExtensions.cs
+++ b/Libraries/Opc.Ua.Gds.Client.Common/RegisteredApplicationExtensions.cs
@@ -152,7 +152,7 @@ public List<string> GetDomainNames(X509Certificate2 certificate)
 
             if (certificate != null)
             {
-                var names = X509Utils.GetDomainsFromCertficate(certificate);
+                var names = X509Utils.GetDomainsFromCertificate(certificate);
 
                 if (names != null && names.Count > 0)
                 {
diff --git a/Libraries/Opc.Ua.Server/Configuration/ConfigurationNodeManager.cs b/Libraries/Opc.Ua.Server/Configuration/ConfigurationNodeManager.cs
index 1640a59b2c..4497c61d42 100644
--- a/Libraries/Opc.Ua.Server/Configuration/ConfigurationNodeManager.cs
+++ b/Libraries/Opc.Ua.Server/Configuration/ConfigurationNodeManager.cs
@@ -529,7 +529,7 @@ private ServiceResult CreateSigningRequest(
             var passwordProvider = m_configuration.SecurityConfiguration.CertificatePasswordProvider;
             X509Certificate2 certWithPrivateKey = certificateGroup.ApplicationCertificate.LoadPrivateKeyEx(passwordProvider).Result;
             Utils.LogCertificate(Utils.TraceMasks.Security, "Create signing request: ", certWithPrivateKey);
-            certificateRequest = CertificateFactory.CreateSigningRequest(certWithPrivateKey, X509Utils.GetDomainsFromCertficate(certWithPrivateKey));
+            certificateRequest = CertificateFactory.CreateSigningRequest(certWithPrivateKey, X509Utils.GetDomainsFromCertificate(certWithPrivateKey));
             return ServiceResult.Good;
         }
 
diff --git a/Libraries/Opc.Ua.Server/Server/StandardServer.cs b/Libraries/Opc.Ua.Server/Server/StandardServer.cs
index b07118c56a..a171f6de32 100644
--- a/Libraries/Opc.Ua.Server/Server/StandardServer.cs
+++ b/Libraries/Opc.Ua.Server/Server/StandardServer.cs
@@ -2373,7 +2373,7 @@ private void RegistrationValidator_CertificateValidation(CertificateValidator se
         {
             System.Net.IPAddress[] targetAddresses = Utils.GetHostAddresses(Utils.GetHostName());
 
-            foreach (string domain in X509Utils.GetDomainsFromCertficate(e.Certificate))
+            foreach (string domain in X509Utils.GetDomainsFromCertificate(e.Certificate))
             {
                 System.Net.IPAddress[] actualAddresses = Utils.GetHostAddresses(domain);
 
diff --git a/Stack/Opc.Ua.Core/Security/Certificates/CertificateValidator.cs b/Stack/Opc.Ua.Core/Security/Certificates/CertificateValidator.cs
index 02f5d46ace..9de96a07e6 100644
--- a/Stack/Opc.Ua.Core/Security/Certificates/CertificateValidator.cs
+++ b/Stack/Opc.Ua.Core/Security/Certificates/CertificateValidator.cs
@@ -1697,7 +1697,7 @@ private bool FindDomain(X509Certificate2 serverCertificate, Uri endpointUrl)
             bool domainFound = false;
 
             // check the certificate domains.
-            IList<string> domains = X509Utils.GetDomainsFromCertficate(serverCertificate);
+            IList<string> domains = X509Utils.GetDomainsFromCertificate(serverCertificate);
 
             if (domains != null && domains.Count > 0)
             {
diff --git a/Stack/Opc.Ua.Core/Security/Certificates/X509Utils.cs b/Stack/Opc.Ua.Core/Security/Certificates/X509Utils.cs
index e25b881867..3be9a480fb 100644
--- a/Stack/Opc.Ua.Core/Security/Certificates/X509Utils.cs
+++ b/Stack/Opc.Ua.Core/Security/Certificates/X509Utils.cs
@@ -34,7 +34,7 @@ public static class X509Utils
         /// </summary>
         /// <param name="certificate">The certificate.</param>
         /// <returns>The DNS names.</returns>
-        public static IList<string> GetDomainsFromCertficate(X509Certificate2 certificate)
+        public static IList<string> GetDomainsFromCertificate(X509Certificate2 certificate)
         {
             List<string> dnsNames = new List<string>();
 
@@ -179,7 +179,7 @@ public static bool DoesUrlMatchCertificate(X509Certificate2 certificate, Uri end
                 return false;
             }
 
-            IList<string> domainNames = GetDomainsFromCertficate(certificate);
+            IList<string> domainNames = GetDomainsFromCertificate(certificate);
 
             for (int jj = 0; jj < domainNames.Count; jj++)
             {
diff --git a/Stack/Opc.Ua.Core/Stack/Tcp/TcpListenerChannel.cs b/Stack/Opc.Ua.Core/Stack/Tcp/TcpListenerChannel.cs
index 143eafafca..c178584044 100644
--- a/Stack/Opc.Ua.Core/Stack/Tcp/TcpListenerChannel.cs
+++ b/Stack/Opc.Ua.Core/Stack/Tcp/TcpListenerChannel.cs
@@ -100,7 +100,7 @@ public void SetRequestReceivedCallback(TcpChannelRequestEventHandler callback)
         /// <summary>
         /// Sets the callback used to raise channel audit events.
         /// </summary>
-        public void SetReportOpenSecureChannellAuditCalback(ReportAuditOpenSecureChannelEventHandler callback)
+        public void SetReportOpenSecureChannelAuditCallback(ReportAuditOpenSecureChannelEventHandler callback)
         {
             lock (DataLock)
             {
@@ -111,7 +111,7 @@ public void SetReportOpenSecureChannellAuditCalback(ReportAuditOpenSecureChannel
         /// <summary>
         /// Sets the callback used to raise channel audit events.
         /// </summary>
-        public void SetReportCloseSecureChannellAuditCalback(ReportAuditCloseSecureChannelEventHandler callback)
+        public void SetReportCloseSecureChannelAuditCallback(ReportAuditCloseSecureChannelEventHandler callback)
         {
             lock (DataLock)
             {
@@ -122,7 +122,7 @@ public void SetReportCloseSecureChannellAuditCalback(ReportAuditCloseSecureChann
         /// <summary>
         /// Sets the callback used to raise channel audit events.
         /// </summary>
-        public void SetReportCertificateAuditCalback(ReportAuditCertificateEventHandler callback)
+        public void SetReportCertificateAuditCallback(ReportAuditCertificateEventHandler callback)
         {
             lock (DataLock)
             {
diff --git a/Stack/Opc.Ua.Core/Stack/Tcp/TcpTransportListener.cs b/Stack/Opc.Ua.Core/Stack/Tcp/TcpTransportListener.cs
index 6eef9b4490..25df04b5e0 100644
--- a/Stack/Opc.Ua.Core/Stack/Tcp/TcpTransportListener.cs
+++ b/Stack/Opc.Ua.Core/Stack/Tcp/TcpTransportListener.cs
@@ -260,9 +260,9 @@ private void OnReverseHelloComplete(IAsyncResult result)
                 if (m_callback != null)
                 {
                     channel.SetRequestReceivedCallback(new TcpChannelRequestEventHandler(OnRequestReceived));
-                    channel.SetReportOpenSecureChannellAuditCalback(new ReportAuditOpenSecureChannelEventHandler(OnReportAuditOpenSecureChannelEvent));
-                    channel.SetReportCloseSecureChannellAuditCalback(new ReportAuditCloseSecureChannelEventHandler(OnReportAuditCloseSecureChannelEvent));
-                    channel.SetReportCertificateAuditCalback(new ReportAuditCertificateEventHandler(OnReportAuditCertificateEvent));
+                    channel.SetReportOpenSecureChannelAuditCallback(new ReportAuditOpenSecureChannelEventHandler(OnReportAuditOpenSecureChannelEvent));
+                    channel.SetReportCloseSecureChannelAuditCallback(new ReportAuditCloseSecureChannelEventHandler(OnReportAuditCloseSecureChannelEvent));
+                    channel.SetReportCertificateAuditCallback(new ReportAuditCertificateEventHandler(OnReportAuditCertificateEvent));
                 }
             }
             catch (Exception e)
@@ -512,9 +512,9 @@ private void OnAccept(object sender, SocketAsyncEventArgs e)
                             if (m_callback != null)
                             {
                                 channel.SetRequestReceivedCallback(new TcpChannelRequestEventHandler(OnRequestReceived));
-                                channel.SetReportOpenSecureChannellAuditCalback(new ReportAuditOpenSecureChannelEventHandler(OnReportAuditOpenSecureChannelEvent));
-                                channel.SetReportCloseSecureChannellAuditCalback(new ReportAuditCloseSecureChannelEventHandler(OnReportAuditCloseSecureChannelEvent));
-                                channel.SetReportCertificateAuditCalback(new ReportAuditCertificateEventHandler(OnReportAuditCertificateEvent));
+                                channel.SetReportOpenSecureChannelAuditCallback(new ReportAuditOpenSecureChannelEventHandler(OnReportAuditOpenSecureChannelEvent));
+                                channel.SetReportCloseSecureChannelAuditCallback(new ReportAuditCloseSecureChannelEventHandler(OnReportAuditCloseSecureChannelEvent));
+                                channel.SetReportCertificateAuditCallback(new ReportAuditCertificateEventHandler(OnReportAuditCertificateEvent));
                             }
 
                             // get channel id
diff --git a/Tests/Opc.Ua.Configuration.Tests/CertificateStoreTypeTest.cs b/Tests/Opc.Ua.Configuration.Tests/CertificateStoreTypeTest.cs
index 8b4b6c6924..346dbcdcf6 100644
--- a/Tests/Opc.Ua.Configuration.Tests/CertificateStoreTypeTest.cs
+++ b/Tests/Opc.Ua.Configuration.Tests/CertificateStoreTypeTest.cs
@@ -65,7 +65,7 @@ public void TearDown()
 
         #region Test Methods
         [Test]
-        public async Task CertifcateStoreTypeNoConfigTest()
+        public async Task CertificateStoreTypeNoConfigTest()
         {
             ApplicationInstance application = new ApplicationInstance() {
                 ApplicationName = "Application",
diff --git a/Tests/Opc.Ua.Core.Tests/Security/Certificates/CertificateFactoryTest.cs b/Tests/Opc.Ua.Core.Tests/Security/Certificates/CertificateFactoryTest.cs
index 8b85df4953..fcab02e034 100644
--- a/Tests/Opc.Ua.Core.Tests/Security/Certificates/CertificateFactoryTest.cs
+++ b/Tests/Opc.Ua.Core.Tests/Security/Certificates/CertificateFactoryTest.cs
@@ -427,7 +427,7 @@ public static void VerifyApplicationCert(ApplicationTestData testApp, X509Certif
             Assert.NotNull(subjectAlternateName);
             TestContext.Out.WriteLine(subjectAlternateName.Format(true));
             Assert.False(subjectAlternateName.Critical);
-            var domainNames = X509Utils.GetDomainsFromCertficate(cert);
+            var domainNames = X509Utils.GetDomainsFromCertificate(cert);
             foreach (var domainName in testApp.DomainNames)
             {
                 Assert.True(domainNames.Contains(domainName, StringComparer.OrdinalIgnoreCase));
diff --git a/Tests/Opc.Ua.Core.Tests/Security/Certificates/CertificateStoreTypeTest.cs b/Tests/Opc.Ua.Core.Tests/Security/Certificates/CertificateStoreTypeTest.cs
index d0c22279f1..7b77554c01 100644
--- a/Tests/Opc.Ua.Core.Tests/Security/Certificates/CertificateStoreTypeTest.cs
+++ b/Tests/Opc.Ua.Core.Tests/Security/Certificates/CertificateStoreTypeTest.cs
@@ -22,7 +22,7 @@ protected void OneTimeSetUp()
 
         #region Test Methods
         [Test]
-        public async Task CertifcateStoreTypeConfigTest()
+        public async Task CertificateStoreTypeConfigTest()
         {
             var fileInfo = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory, "Security", "Certificates", "CertificateStoreTypeTestConfig.xml"));
             var appConfig = await ApplicationConfiguration.Load(fileInfo, ApplicationType.Client, null).ConfigureAwait(false);
diff --git a/Tests/Opc.Ua.Core.Tests/Types/Encoders/EncodeableTests.cs b/Tests/Opc.Ua.Core.Tests/Types/Encoders/EncodeableTests.cs
index c0de999964..b615578560 100644
--- a/Tests/Opc.Ua.Core.Tests/Types/Encoders/EncodeableTests.cs
+++ b/Tests/Opc.Ua.Core.Tests/Types/Encoders/EncodeableTests.cs
@@ -39,7 +39,7 @@ namespace Opc.Ua.Core.Tests.Types.Encoders
     /// <summary>
     /// Tests for the IEncodeable classes.
     /// </summary>
-    [TestFixture, Category("EncodableTypes")]
+    [TestFixture, Category("EncodeableTypes")]
     [SetCulture("en-us"), SetUICulture("en-us")]
     [Parallelizable]
     public class EncodeableTypesTests : EncoderCommon
@@ -54,13 +54,13 @@ public class EncodeableTypesTests : EncoderCommon
         /// Verify encode and decode of an encodeable type.
         /// </summary>
         [Theory]
-        [Category("EncodableTypes")]
-        public void ActivateEncodableType(
+        [Category("EncodeableTypes")]
+        public void ActivateEncodeableType(
             EncodingType encoderType,
             Type systemType
             )
         {
-            IEncodeable testObject = CreateDefaultEncodableType(systemType) as IEncodeable;
+            IEncodeable testObject = CreateDefaultEncodeableType(systemType) as IEncodeable;
             Assert.NotNull(testObject);
             Assert.False(testObject.BinaryEncodingId.IsNull);
             Assert.False(testObject.TypeId.IsNull);
@@ -72,8 +72,8 @@ Type systemType
         }
 
         [Theory]
-        [Category("EncodableTypes")]
-        public void ActivateEncodableTypeArray(
+        [Category("EncodeableTypes")]
+        public void ActivateEncodeableTypeArray(
             EncodingType encoderType,
             Type systemType
             )
@@ -83,7 +83,7 @@ Type systemType
             ExpandedNodeId dataTypeId = NodeId.Null;
             for (int i = 0; i < array.Length; i++)
             {
-                IEncodeable testObject = CreateDefaultEncodableType(systemType) as IEncodeable;
+                IEncodeable testObject = CreateDefaultEncodeableType(systemType) as IEncodeable;
                 array.SetValue(testObject, i);
                 if (dataTypeId == NodeId.Null)
                 {
@@ -137,8 +137,8 @@ Type systemType
         }
 
         [Theory]
-        [Category("EncodableTypes")]
-        public void ActivateEncodableTypeMatrix(
+        [Category("EncodeableTypes")]
+        public void ActivateEncodeableTypeMatrix(
             EncodingType encoderType,
             bool encodeAsMatrix,
             Type systemType
@@ -153,7 +153,7 @@ Type systemType
             ExpandedNodeId dataTypeId = NodeId.Null;
             for (int i = 0; i < array.Length; i++)
             {
-                IEncodeable testObject = CreateDefaultEncodableType(systemType) as IEncodeable;
+                IEncodeable testObject = CreateDefaultEncodeableType(systemType) as IEncodeable;
                 array.SetValue(testObject, i);
                 if (dataTypeId == NodeId.Null)
                 {
@@ -216,7 +216,7 @@ Type systemType
         /// Create an instance of an encodeable type with default values.
         /// </summary>
         /// <param name="systemType">The type to create</param>
-        private object CreateDefaultEncodableType(Type systemType)
+        private object CreateDefaultEncodeableType(Type systemType)
         {
             object instance = Activator.CreateInstance(systemType);
             SetDefaultEncodeableType(systemType, instance);
diff --git a/Tests/Opc.Ua.Gds.Tests/PushTest.cs b/Tests/Opc.Ua.Gds.Tests/PushTest.cs
index 8bfa568cf8..c31bc12732 100644
--- a/Tests/Opc.Ua.Gds.Tests/PushTest.cs
+++ b/Tests/Opc.Ua.Gds.Tests/PushTest.cs
@@ -83,7 +83,7 @@ protected async Task OneTimeSetUp()
             RegisterPushServerApplication(m_pushClient.PushClient.EndpointUrl);
 
             m_selfSignedServerCert = new X509Certificate2(m_pushClient.PushClient.Session.ConfiguredEndpoint.Description.ServerCertificate);
-            m_domainNames = X509Utils.GetDomainsFromCertficate(m_selfSignedServerCert).ToArray();
+            m_domainNames = X509Utils.GetDomainsFromCertificate(m_selfSignedServerCert).ToArray();
 
             await CreateCATestCerts(m_pushClient.TempStorePath).ConfigureAwait(false);
         }
diff --git a/Tests/Opc.Ua.Gds.Tests/X509TestUtils.cs b/Tests/Opc.Ua.Gds.Tests/X509TestUtils.cs
index 16515b4533..56bc5ade9f 100644
--- a/Tests/Opc.Ua.Gds.Tests/X509TestUtils.cs
+++ b/Tests/Opc.Ua.Gds.Tests/X509TestUtils.cs
@@ -148,7 +148,7 @@ public static void VerifySignedApplicationCert(ApplicationTestData testApp, byte
             Assert.NotNull(subjectAlternateName);
             TestContext.Out.WriteLine($"Issuer Subject Alternate Name: {subjectAlternateName}");
             Assert.False(subjectAlternateName.Critical);
-            var domainNames = X509Utils.GetDomainsFromCertficate(signedCert);
+            var domainNames = X509Utils.GetDomainsFromCertificate(signedCert);
             foreach (var domainName in testApp.DomainNames)
             {
                 Assert.True(domainNames.Contains(domainName, StringComparer.OrdinalIgnoreCase));