diff --git a/Samples/Genetec.Dap.CodeSamples.sln b/Samples/Genetec.Dap.CodeSamples.sln
index 08f64efb..cff91ecd 100644
--- a/Samples/Genetec.Dap.CodeSamples.sln
+++ b/Samples/Genetec.Dap.CodeSamples.sln
@@ -78,7 +78,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CameraConfigurationSample",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CameraSample", "Platform SDK\CameraSample\CameraSample.csproj", "{C94B535D-7C56-4239-A2FC-5412493C9223}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CopyConfiguratonSample", "Platform SDK\CopyConfiguratonSample\CopyConfiguratonSample.csproj", "{5A3CA774-E381-4E87-B8D9-091644B52222}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CopyConfigurationSample", "Platform SDK\CopyConfigurationSample\CopyConfigurationSample.csproj", "{5A3CA774-E381-4E87-B8D9-091644B52222}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomEntitySample", "Platform SDK\CustomEntitySample\CustomEntitySample.csproj", "{B8F6538A-582C-4D99-BC46-7908785779D5}"
 EndProject
diff --git a/Samples/Media SDK/FileCryptingManagerSample/FileCryptingManagerSample.csproj b/Samples/Media SDK/FileCryptingManagerSample/FileCryptingManagerSample.csproj
index 4cfc7572..9c539351 100644
--- a/Samples/Media SDK/FileCryptingManagerSample/FileCryptingManagerSample.csproj	
+++ b/Samples/Media SDK/FileCryptingManagerSample/FileCryptingManagerSample.csproj	
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFrameworks>net481</TargetFrameworks>
 		<RootNamespace>Genetec.Dap.CodeSamples</RootNamespace>
-		<AssemblyName>FileCryptingManager</AssemblyName>
+		<AssemblyName>FileCryptingManagerSample</AssemblyName>
 		<Description>Sample project</Description>
 		<Company>Genetec Inc.</Company>
 		<Copyright>Copyright © Genetec Inc. 2024</Copyright>
diff --git a/Samples/Platform SDK/CopyConfiguratonSample/App.config b/Samples/Platform SDK/CopyConfigurationSample/App.config
similarity index 100%
rename from Samples/Platform SDK/CopyConfiguratonSample/App.config
rename to Samples/Platform SDK/CopyConfigurationSample/App.config
diff --git a/Samples/Platform SDK/CopyConfiguratonSample/Certificates/CopyConfiguratonSample.exe.cert b/Samples/Platform SDK/CopyConfigurationSample/Certificates/CopyConfigurationSample.exe.cert
similarity index 100%
rename from Samples/Platform SDK/CopyConfiguratonSample/Certificates/CopyConfiguratonSample.exe.cert
rename to Samples/Platform SDK/CopyConfigurationSample/Certificates/CopyConfigurationSample.exe.cert
diff --git a/Samples/Platform SDK/CopyConfiguratonSample/CopyConfigurationSample.cs b/Samples/Platform SDK/CopyConfigurationSample/CopyConfigurationSample.cs
similarity index 100%
rename from Samples/Platform SDK/CopyConfiguratonSample/CopyConfigurationSample.cs
rename to Samples/Platform SDK/CopyConfigurationSample/CopyConfigurationSample.cs
diff --git a/Samples/Platform SDK/CopyConfiguratonSample/CopyConfiguratonSample.csproj b/Samples/Platform SDK/CopyConfigurationSample/CopyConfigurationSample.csproj
similarity index 100%
rename from Samples/Platform SDK/CopyConfiguratonSample/CopyConfiguratonSample.csproj
rename to Samples/Platform SDK/CopyConfigurationSample/CopyConfigurationSample.csproj
diff --git a/Samples/Platform SDK/CopyConfiguratonSample/EntityManagerExtensions.cs b/Samples/Platform SDK/CopyConfigurationSample/EntityManagerExtensions.cs
similarity index 100%
rename from Samples/Platform SDK/CopyConfiguratonSample/EntityManagerExtensions.cs
rename to Samples/Platform SDK/CopyConfigurationSample/EntityManagerExtensions.cs
diff --git a/Samples/Platform SDK/CopyConfiguratonSample/Program.cs b/Samples/Platform SDK/CopyConfigurationSample/Program.cs
similarity index 100%
rename from Samples/Platform SDK/CopyConfiguratonSample/Program.cs
rename to Samples/Platform SDK/CopyConfigurationSample/Program.cs
diff --git a/Samples/Platform SDK/DiagnosticServerSample/DiagnosticServerSample.csproj b/Samples/Platform SDK/DiagnosticServerSample/DiagnosticServerSample.csproj
index e1c1c23f..75d291c4 100644
--- a/Samples/Platform SDK/DiagnosticServerSample/DiagnosticServerSample.csproj	
+++ b/Samples/Platform SDK/DiagnosticServerSample/DiagnosticServerSample.csproj	
@@ -11,10 +11,10 @@
 		<TargetFrameworks Condition="$(Configuration.EndsWith('_NET481'))">net481</TargetFrameworks>
 		<Configurations>Debug;Release;Debug_NET481;Debug_NET8;Release_NET481;Release_NET8</Configurations>
 		<RootNamespace>Genetec.Dap.CodeSamples</RootNamespace>
-		<AssemblyName>DiagnosticServer</AssemblyName>
+		<AssemblyName>DiagnosticServerSample</AssemblyName>
 		<Description>Sample project</Description>
 		<Company>Genetec Inc.</Company>
-		<Copyright>Copyright © Genetec Inc. 2024</Copyright>
+		<Copyright>Copyright © Genetec Inc. 2024</Copyright>
 		<OutputType>Exe</OutputType>
 	</PropertyGroup>