diff --git a/src/Valleysoft.Dredge/ManifestCommand.cs b/src/Valleysoft.Dredge/ManifestCommand.cs
index 87a0db4..8d78087 100644
--- a/src/Valleysoft.Dredge/ManifestCommand.cs
+++ b/src/Valleysoft.Dredge/ManifestCommand.cs
@@ -7,7 +7,7 @@ namespace Valleysoft.Dredge;
 
 public class ManifestCommand : Command
 {
-    public ManifestCommand() : base("manifest", "Commands related to Docker manifests")
+    public ManifestCommand() : base("manifest", "Commands related to container image manifests")
     {
         AddCommand(new GetCommand());
         AddCommand(new DigestCommand());
@@ -15,9 +15,9 @@ public ManifestCommand() : base("manifest", "Commands related to Docker manifest
 
     private class GetCommand : Command
     {
-        public GetCommand() : base("get", "Queries a Docker manifest")
+        public GetCommand() : base("get", "Queries a container image manifest")
         {
-            Argument<string> imageArg = new("image", "Name of the Docker image (<image>, <image>:<tag>, or <image>@<digest>)");
+            Argument<string> imageArg = new("image", "Name of the container image (<image>, <image>:<tag>, or <image>@<digest>)");
             AddArgument(imageArg);
             this.SetHandler(ExecuteAsync, imageArg);
         }
@@ -40,9 +40,9 @@ private Task ExecuteAsync(string image)
 
     private class DigestCommand : Command
     {
-        public DigestCommand() : base("digest", "Queries the digest of a Docker manifest")
+        public DigestCommand() : base("digest", "Queries the digest of a container image manifest")
         {
-            Argument<string> imageArg = new("image", "Name of the Docker image (<image> or <image>:<tag>");
+            Argument<string> imageArg = new("image", "Name of the container image image (<image> or <image>:<tag>");
             AddArgument(imageArg);
             this.SetHandler(ExecuteAsync, imageArg);
         }
diff --git a/src/Valleysoft.Dredge/Program.cs b/src/Valleysoft.Dredge/Program.cs
index d48c849..141db0b 100644
--- a/src/Valleysoft.Dredge/Program.cs
+++ b/src/Valleysoft.Dredge/Program.cs
@@ -1,7 +1,7 @@
 using System.CommandLine;
 using Valleysoft.Dredge;
 
-RootCommand rootCmd = new("CLI for executing commands on a Docker registry's HTTP API.")
+RootCommand rootCmd = new("CLI for executing commands on a container registry's HTTP API.")
 {
     new ImageCommand(),
     new ManifestCommand(),
diff --git a/src/Valleysoft.Dredge/RepoCommand.cs b/src/Valleysoft.Dredge/RepoCommand.cs
index 48efeba..896575c 100644
--- a/src/Valleysoft.Dredge/RepoCommand.cs
+++ b/src/Valleysoft.Dredge/RepoCommand.cs
@@ -7,16 +7,16 @@ namespace Valleysoft.Dredge;
 
 public class RepoCommand : Command
 {
-    public RepoCommand() : base("repo", "Commands related to Docker repositories")
+    public RepoCommand() : base("repo", "Commands related to container repositories")
     {
         AddCommand(new ListCommand());
     }
 
     private class ListCommand : Command
     {
-        public ListCommand() : base("list", "Lists the repositories contained in the Docker registry")
+        public ListCommand() : base("list", "Lists the repositories contained in the container registry")
         {
-            Argument<string> registryArg = new("registry", "Name of the Docker registry");
+            Argument<string> registryArg = new("registry", "Name of the container registry");
             AddArgument(registryArg);
 
             this.SetHandler(ExecuteAsync, registryArg);
diff --git a/src/Valleysoft.Dredge/TagCommand.cs b/src/Valleysoft.Dredge/TagCommand.cs
index dd63e9d..e95e9fc 100644
--- a/src/Valleysoft.Dredge/TagCommand.cs
+++ b/src/Valleysoft.Dredge/TagCommand.cs
@@ -7,16 +7,16 @@ namespace Valleysoft.Dredge;
 
 public class TagCommand : Command
 {
-    public TagCommand() : base("tag", "Commands related to Docker tags")
+    public TagCommand() : base("tag", "Commands related to container image tags")
     {
         AddCommand(new ListCommand());
     }
 
     private class ListCommand : Command
     {
-        public ListCommand() : base("list", "Lists the tag contained in the Docker repository")
+        public ListCommand() : base("list", "Lists the tag contained in the container repository")
         {
-            Argument<string> repoArg = new("repo", "Name of the Docker repository");
+            Argument<string> repoArg = new("repo", "Name of the container repository");
             AddArgument(repoArg);
 
             this.SetHandler(ExecuteAsync, repoArg);
diff --git a/src/Valleysoft.Dredge/Valleysoft.Dredge.csproj b/src/Valleysoft.Dredge/Valleysoft.Dredge.csproj
index 2c919f0..5f3112e 100644
--- a/src/Valleysoft.Dredge/Valleysoft.Dredge.csproj
+++ b/src/Valleysoft.Dredge/Valleysoft.Dredge.csproj
@@ -17,9 +17,9 @@
 
   <PropertyGroup>
     <PackageId>Valleysoft.Dredge</PackageId>
-    <Title>Docker Registry Client CLI</Title>
-    <Description>CLI for executing commands on a Docker registry's HTTP API.</Description>
-    <PackageTags>docker</PackageTags>
+    <Title>Container Registry Client CLI</Title>
+    <Description>CLI for executing commands on a container registry's HTTP API.</Description>
+    <PackageTags>docker;container</PackageTags>
     <Authors>Matt Thalman and Contributors</Authors>
     <RepositoryUrl>https://github.com/mthalman/dredge</RepositoryUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>