diff --git a/Duplicati/CommandLine/RecoveryTool/Recompress.cs b/Duplicati/CommandLine/RecoveryTool/Recompress.cs
index 548b24eb7..19dc9275e 100644
--- a/Duplicati/CommandLine/RecoveryTool/Recompress.cs
+++ b/Duplicati/CommandLine/RecoveryTool/Recompress.cs
@@ -199,7 +199,7 @@ namespace Duplicati.CommandLine.RecoveryTool
                         {
                             Console.Write(" recompressing ...");
 
-                            //Recompressing from e.g. zip to zip
+                            //Recompressing from e.g. ZIP to ZIP
                             if (localFileSource == localFileTarget)
                             {
                                 File.Move(localFileSource, localFileSource + ".same");
diff --git a/Duplicati/CommandLine/RecoveryTool/help.txt b/Duplicati/CommandLine/RecoveryTool/help.txt
index ae4a7fb66..c720d8c20 100644
--- a/Duplicati/CommandLine/RecoveryTool/help.txt
+++ b/Duplicati/CommandLine/RecoveryTool/help.txt
@@ -25,7 +25,7 @@ Optionally you can also run:
   Shows what files are available and tests filters
 
 5: Recompress
-  Ability to change compression type of files on remote backend e.g. from 7z to zip
+  Ability to change compression type of files on remote backend e.g. from 7z to ZIP
 
 
 
@@ -71,7 +71,7 @@ If the process is interrupted for any reason, note the file counter and use --of
 Advanced performance options are:
   --reduce-memory-use: Disables keeping all hashes in memory; use if memory is limited on the restoring machine
   --disable-file-verify: Disables the initial hashing of the restored file
-  --disable-wrapped-zip: Disable using the faster .NET native Zip archive in favor of the more resilient one in Duplicati
+  --disable-wrapped-zip: Disable using the faster .NET native ZIP archive in favor of the more resilient one in Duplicati
   --max-open-archives: Sets the number of archives to keep open for faster access (uses some memory pr. archive); default 200
 
 List
diff --git a/Duplicati/Library/Compression/FileArchiveZip.cs b/Duplicati/Library/Compression/FileArchiveZip.cs
index fa731ed2e..654acb6ea 100644
--- a/Duplicati/Library/Compression/FileArchiveZip.cs
+++ b/Duplicati/Library/Compression/FileArchiveZip.cs
@@ -34,7 +34,7 @@ using System.Linq;
 namespace Duplicati.Library.Compression
 {
     /// <summary>
-    /// An abstraction of a zip archive as a FileArchive, based on SharpCompress.
+    /// An abstraction of a ZIP archive as a FileArchive, based on SharpCompress.
     /// Please note, duplicati does not require both Read &amp; Write access at the same time so this has not been implemented.
     /// </summary>
     public class FileArchiveZip : ICompression
@@ -62,7 +62,7 @@ namespace Duplicati.Library.Compression
         /// </summary>
         private const string COMPRESSION_METHOD_OPTION = "zip-compression-method";
         /// <summary>
-        /// The commandline option for toggling the zip64 support
+        /// The commandline option for toggling the ZIP64 support
         /// </summary>
         private const string COMPRESSION_ZIP64_OPTION = "zip-compression-zip64";
 
@@ -77,7 +77,7 @@ namespace Duplicati.Library.Compression
         private const CompressionType DEFAULT_COMPRESSION_METHOD = CompressionType.Deflate;
 
         /// <summary>
-        /// The default setting for the zip64 support
+        /// The default setting for the ZIP64 support
         /// </summary>
         private const bool DEFAULT_ZIP64 = false;
 
@@ -87,7 +87,7 @@ namespace Duplicati.Library.Compression
         private const int CENTRAL_HEADER_ENTRY_SIZE = 8 + 2 + 2 + 4 + 4 + 4 + 4 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 4;
 
         /// <summary>
-        /// The size of the extended zip64 header
+        /// The size of the extended ZIP64 header
         /// </summary>
         private const int CENTRAL_HEADER_ENTRY_SIZE_ZIP64_EXTRA = 2 + 2 + 8 + 8 + 8 + 4;
 
@@ -137,7 +137,7 @@ namespace Duplicati.Library.Compression
         private readonly CompressionType m_compressionType;
 
         /// <summary>
-        /// A flag indicating if zip64 is in use
+        /// A flag indicating if ZIP64 is in use
         /// </summary>
         private readonly bool m_usingZip64;
 
@@ -199,7 +199,7 @@ namespace Duplicati.Library.Compression
         }
 
         /// <summary>
-        /// Constructs a new zip instance.
+        /// Constructs a new ZIP instance.
         /// Access mode is specified by mode parameter.
         /// Note that stream would not be disposed by FileArchiveZip instance so
         /// you may reuse it and have to dispose it yourself.
@@ -361,7 +361,7 @@ namespace Duplicati.Library.Compression
                     if (m_using_reader)
                         throw;
 
-                    Logging.Log.WriteWarningMessage(LOGTAG, "BrokenCentralHeaderFallback", ex, "Zip archive appears to have a broken Central Record Header, switching to stream mode");
+                    Logging.Log.WriteWarningMessage(LOGTAG, "BrokenCentralHeaderFallback", ex, "ZIP archive appears to have a broken Central Record Header, switching to stream mode");
                     SwitchToReader();
 
                     var d = new Dictionary<string, IEntry>(Duplicati.Library.Utility.Utility.ClientFilenameStringComparer);
@@ -385,7 +385,7 @@ namespace Duplicati.Library.Compression
                         if (d.Count < 2)
                             throw;
 
-                        Logging.Log.WriteWarningMessage(LOGTAG, "BrokenCentralHeader", ex2, "Zip archive appears to have broken records, returning the {0} records that could be recovered", d.Count);
+                        Logging.Log.WriteWarningMessage(LOGTAG, "BrokenCentralHeader", ex2, "ZIP archive appears to have broken records, returning the {0} records that could be recovered", d.Count);
                     }
 
                     m_entryDict = d;
diff --git a/Duplicati/Library/Compression/SevenZipCompression.cs b/Duplicati/Library/Compression/SevenZipCompression.cs
index 5db2049d1..1906e3666 100644
--- a/Duplicati/Library/Compression/SevenZipCompression.cs
+++ b/Duplicati/Library/Compression/SevenZipCompression.cs
@@ -69,7 +69,7 @@ namespace Duplicati.Library.Compression
         public SevenZipCompression() { }
 
         /// <summary>
-        /// Constructs a new zip instance.
+        /// Constructs a new ZIP instance.
         /// Access mode is specified by mode parameter.
         /// Note that stream would not be disposed by FileArchiveZip instance so
         /// you may reuse it and have to dispose it yourself.
diff --git a/Duplicati/Library/Compression/Strings.cs b/Duplicati/Library/Compression/Strings.cs
index f71114fe1..1dcc1e101 100644
--- a/Duplicati/Library/Compression/Strings.cs
+++ b/Duplicati/Library/Compression/Strings.cs
@@ -21,15 +21,15 @@
 using Duplicati.Library.Localization.Short;
 namespace Duplicati.Library.Compression.Strings {
     internal static class FileArchiveZip {
-        public static string Description { get { return LC.L(@"This module provides the industry standard Zip compression. Files created with this module can be read by any standard-compliant zip application."); } }
-        public static string DisplayName { get { return LC.L(@"Zip compression"); } }
+        public static string Description { get { return LC.L(@"This module provides the industry standard ZIP compression. Files created with this module can be read by any standard-compliant ZIP application."); } }
+        public static string DisplayName { get { return LC.L(@"ZIP compression"); } }
         public static string CompressionlevelDeprecated(string optionname) { return LC.L(@"Please use the {0} option instead.", optionname); }
         public static string CompressionlevelLong { get { return LC.L(@"This option controls the compression level used. A setting of zero gives no compression, and a setting of 9 gives maximum compression."); } }
-        public static string CompressionlevelShort { get { return LC.L(@"Sets the Zip compression level"); } }
+        public static string CompressionlevelShort { get { return LC.L(@"Sets the ZIP compression level"); } }
         public static string CompressionmethodLong(string optionname) { return LC.L(@"This option can be used to set an alternative compressor method, such as LZMA. Note that using another value than Deflate will cause the {0} option to be ignored.", optionname); }
-        public static string CompressionmethodShort { get { return LC.L(@"Sets the Zip compression method"); } }
-        public static string Compressionzip64Long { get { return LC.L(@"The zip64 format is required for files larger than 4GiB. Use this option to toggle it."); } }
-        public static string Compressionzip64Short { get { return LC.L(@"Toggles Zip64 support"); } }
+        public static string CompressionmethodShort { get { return LC.L(@"Sets the ZIP compression method"); } }
+        public static string Compressionzip64Long { get { return LC.L(@"The ZIP64 format is required for files larger than 4GiB. Use this option to toggle it."); } }
+        public static string Compressionzip64Short { get { return LC.L(@"Toggles ZIP64 support"); } }
         public static string FileNotFoundError(string filename) { return LC.L(@"File not found: {0}", filename); }
     }
     internal static class SevenZipCompression {
diff --git a/ReleaseBuilder/Build/Command.CreatePackage.cs b/ReleaseBuilder/Build/Command.CreatePackage.cs
index beafc3afd..5089a2770 100644
--- a/ReleaseBuilder/Build/Command.CreatePackage.cs
+++ b/ReleaseBuilder/Build/Command.CreatePackage.cs
@@ -163,11 +163,11 @@ public static partial class Command
         }
 
         /// <summary>
-        /// Builds a zip package asynchronously.
+        /// Builds a ZIP package asynchronously.
         /// </summary>
-        /// <param name="buildRoot">The output folder where the zip package will be created.</param>
-        /// <param name="dirName">The directory name to use as the root zip name.</param>
-        /// <param name="zipFile">The zip file to generate.</param>
+        /// <param name="buildRoot">The output folder where the ZIP package will be created.</param>
+        /// <param name="dirName">The directory name to use as the root ZIP name.</param>
+        /// <param name="zipFile">The ZIP file to generate.</param>
         /// <param name="target">The package target.</param>
         /// <param name="rtcfg">The runtime configuration.</param>
         /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
diff --git a/ReleaseBuilder/PackageTarget.cs b/ReleaseBuilder/PackageTarget.cs
index b51c8f983..7d8ea3b92 100644
--- a/ReleaseBuilder/PackageTarget.cs
+++ b/ReleaseBuilder/PackageTarget.cs
@@ -50,7 +50,7 @@ public enum ArchType
 public enum PackageType
 {
     /// <summary>
-    /// The basic zip package
+    /// The basic ZIP package
     /// </summary>
     Zip,
     /// <summary>
@@ -245,4 +245,4 @@ public record PackageTarget(OSType OS, ArchType Arch, InterfaceType Interface, P
 
         return new PackageTarget(os, arch, interfaceType, package);
     }
-}
\ No newline at end of file
+}
diff --git a/Tools/ZipFileDebugger/Program.cs b/Tools/ZipFileDebugger/Program.cs
index 4303f2c94..e6116dc94 100644
--- a/Tools/ZipFileDebugger/Program.cs
+++ b/Tools/ZipFileDebugger/Program.cs
@@ -56,7 +56,7 @@ namespace ZipFileDebugger
                     continue;
                 }
 
-                Console.WriteLine("Opening zip file {0}", file);
+                Console.WriteLine("Opening ZIP file {0}", file);
 
                 var errors = false;
 
@@ -113,7 +113,7 @@ namespace ZipFileDebugger
                 }
             }
 
-            Console.Write("Processed {0} zip files", filecount);
+            Console.Write("Processed {0} ZIP files", filecount);
             if (errorcount == 0)
                 Console.WriteLine(" without errors");
             else