diff --git a/cmd/flux/delete_image.go b/cmd/flux/delete_image.go
index f5d125d215ac72024b8912bd7c114e533534a19f..7547ae7fb24705c24ecf0db2e6fabf08c2c19c53 100644
--- a/cmd/flux/delete_image.go
+++ b/cmd/flux/delete_image.go
@@ -20,12 +20,12 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var deleteAutoCmd = &cobra.Command{
-	Use:   "auto",
-	Short: "Delete automation objects",
-	Long:  "The delete auto sub-commands delete automation objects.",
+var deleteImageCmd = &cobra.Command{
+	Use:   "image",
+	Short: "Delete image automation objects",
+	Long:  "The delete image sub-commands delete image automation objects.",
 }
 
 func init() {
-	deleteCmd.AddCommand(deleteAutoCmd)
+	deleteCmd.AddCommand(deleteImageCmd)
 }
diff --git a/cmd/flux/delete_image_policy.go b/cmd/flux/delete_image_policy.go
index 2daf9f0c95bdf62b660526ef0fbd84c2ff706f28..e586c67d018945e29ac85574521338912e6d3a91 100644
--- a/cmd/flux/delete_image_policy.go
+++ b/cmd/flux/delete_image_policy.go
@@ -23,11 +23,11 @@ import (
 )
 
 var deleteImagePolicyCmd = &cobra.Command{
-	Use:   "image-policy [name]",
+	Use:   "policy [name]",
 	Short: "Delete an ImagePolicy object",
-	Long:  "The delete auto image-policy command deletes the given ImagePolicy from the cluster.",
+	Long:  "The delete image policy command deletes the given ImagePolicy from the cluster.",
 	Example: `  # Delete an image policy
-  flux delete auto image-policy alpine3.x
+  flux delete image policy alpine3.x
 `,
 	RunE: deleteCommand{
 		apiType: imagePolicyType,
@@ -36,5 +36,5 @@ var deleteImagePolicyCmd = &cobra.Command{
 }
 
 func init() {
-	deleteAutoCmd.AddCommand(deleteImagePolicyCmd)
+	deleteImageCmd.AddCommand(deleteImagePolicyCmd)
 }
diff --git a/cmd/flux/delete_image_repository.go b/cmd/flux/delete_image_repository.go
index 46669eb72a81434c78ae23a1bfb869c974cf1cbe..0038fb96e5e31f48de07fa99f18d48044d87f452 100644
--- a/cmd/flux/delete_image_repository.go
+++ b/cmd/flux/delete_image_repository.go
@@ -23,11 +23,11 @@ import (
 )
 
 var deleteImageRepositoryCmd = &cobra.Command{
-	Use:   "image-repository [name]",
+	Use:   "repository [name]",
 	Short: "Delete an ImageRepository object",
-	Long:  "The delete auto image-repository command deletes the given ImageRepository from the cluster.",
+	Long:  "The delete image repository command deletes the given ImageRepository from the cluster.",
 	Example: `  # Delete an image repository
-  flux delete auto image-repository alpine
+  flux delete image repository alpine
 `,
 	RunE: deleteCommand{
 		apiType: imageRepositoryType,
@@ -36,5 +36,5 @@ var deleteImageRepositoryCmd = &cobra.Command{
 }
 
 func init() {
-	deleteAutoCmd.AddCommand(deleteImageRepositoryCmd)
+	deleteImageCmd.AddCommand(deleteImageRepositoryCmd)
 }
diff --git a/cmd/flux/delete_image_updateauto.go b/cmd/flux/delete_image_updateauto.go
index 0eb76a33e85d6059c50a1c9e1ef36303a07f2481..a5281152cd1d5663a29b63fd2858cebd9ff97dcc 100644
--- a/cmd/flux/delete_image_updateauto.go
+++ b/cmd/flux/delete_image_updateauto.go
@@ -23,11 +23,11 @@ import (
 )
 
 var deleteImageUpdateCmd = &cobra.Command{
-	Use:   "image-update [name]",
+	Use:   "update [name]",
 	Short: "Delete an ImageUpdateAutomation object",
-	Long:  "The delete auto image-update command deletes the given ImageUpdateAutomation from the cluster.",
+	Long:  "The delete image update command deletes the given ImageUpdateAutomation from the cluster.",
 	Example: `  # Delete an image update automation
-  flux delete auto image-update latest-images
+  flux delete image update latest-images
 `,
 	RunE: deleteCommand{
 		apiType: imageUpdateAutomationType,
@@ -36,5 +36,5 @@ var deleteImageUpdateCmd = &cobra.Command{
 }
 
 func init() {
-	deleteAutoCmd.AddCommand(deleteImageUpdateCmd)
+	deleteImageCmd.AddCommand(deleteImageUpdateCmd)
 }
diff --git a/docs/cmd/flux_delete.md b/docs/cmd/flux_delete.md
index 360153c45eef18f08f5ba21f68fbc241e7daaa40..402106ef4c823fde65c878919974928b27ccadf7 100644
--- a/docs/cmd/flux_delete.md
+++ b/docs/cmd/flux_delete.md
@@ -28,8 +28,8 @@ The delete sub-commands delete sources and resources.
 * [flux](flux.md)	 - Command line utility for assembling Kubernetes CD pipelines
 * [flux delete alert](flux_delete_alert.md)	 - Delete a Alert resource
 * [flux delete alert-provider](flux_delete_alert-provider.md)	 - Delete a Provider resource
-* [flux delete auto](flux_delete_auto.md)	 - Delete automation objects
 * [flux delete helmrelease](flux_delete_helmrelease.md)	 - Delete a HelmRelease resource
+* [flux delete image](flux_delete_image.md)	 - Delete image automation objects
 * [flux delete kustomization](flux_delete_kustomization.md)	 - Delete a Kustomization resource
 * [flux delete receiver](flux_delete_receiver.md)	 - Delete a Receiver resource
 * [flux delete source](flux_delete_source.md)	 - Delete sources
diff --git a/docs/cmd/flux_delete_auto.md b/docs/cmd/flux_delete_image.md
similarity index 56%
rename from docs/cmd/flux_delete_auto.md
rename to docs/cmd/flux_delete_image.md
index 5e79d858114acec8d4486cff57c81dc8dd76865f..dbe5d0d2be1425c4c632f9bd2c3ded6a1c4e44fb 100644
--- a/docs/cmd/flux_delete_auto.md
+++ b/docs/cmd/flux_delete_image.md
@@ -1,15 +1,15 @@
-## flux delete auto
+## flux delete image
 
-Delete automation objects
+Delete image automation objects
 
 ### Synopsis
 
-The delete auto sub-commands delete automation objects.
+The delete image sub-commands delete image automation objects.
 
 ### Options
 
 ```
-  -h, --help   help for auto
+  -h, --help   help for image
 ```
 
 ### Options inherited from parent commands
@@ -26,7 +26,7 @@ The delete auto sub-commands delete automation objects.
 ### SEE ALSO
 
 * [flux delete](flux_delete.md)	 - Delete sources and resources
-* [flux delete auto image-policy](flux_delete_auto_image-policy.md)	 - Delete an ImagePolicy object
-* [flux delete auto image-repository](flux_delete_auto_image-repository.md)	 - Delete an ImageRepository object
-* [flux delete auto image-update](flux_delete_auto_image-update.md)	 - Delete an ImageUpdateAutomation object
+* [flux delete image policy](flux_delete_image_policy.md)	 - Delete an ImagePolicy object
+* [flux delete image repository](flux_delete_image_repository.md)	 - Delete an ImageRepository object
+* [flux delete image update](flux_delete_image_update.md)	 - Delete an ImageUpdateAutomation object
 
diff --git a/docs/cmd/flux_delete_auto_image-policy.md b/docs/cmd/flux_delete_image_policy.md
similarity index 66%
rename from docs/cmd/flux_delete_auto_image-policy.md
rename to docs/cmd/flux_delete_image_policy.md
index 64152e003e63df6a16ee8512c32f681d187546e1..2c9ce67e173757307e1e8846fed95ab5b888d3d9 100644
--- a/docs/cmd/flux_delete_auto_image-policy.md
+++ b/docs/cmd/flux_delete_image_policy.md
@@ -1,27 +1,27 @@
-## flux delete auto image-policy
+## flux delete image policy
 
 Delete an ImagePolicy object
 
 ### Synopsis
 
-The delete auto image-policy command deletes the given ImagePolicy from the cluster.
+The delete image policy command deletes the given ImagePolicy from the cluster.
 
 ```
-flux delete auto image-policy [name] [flags]
+flux delete image policy [name] [flags]
 ```
 
 ### Examples
 
 ```
   # Delete an image policy
-  flux delete auto image-policy alpine3.x
+  flux delete image policy alpine3.x
 
 ```
 
 ### Options
 
 ```
-  -h, --help   help for image-policy
+  -h, --help   help for policy
 ```
 
 ### Options inherited from parent commands
@@ -37,5 +37,5 @@ flux delete auto image-policy [name] [flags]
 
 ### SEE ALSO
 
-* [flux delete auto](flux_delete_auto.md)	 - Delete automation objects
+* [flux delete image](flux_delete_image.md)	 - Delete image automation objects
 
diff --git a/docs/cmd/flux_delete_auto_image-repository.md b/docs/cmd/flux_delete_image_repository.md
similarity index 65%
rename from docs/cmd/flux_delete_auto_image-repository.md
rename to docs/cmd/flux_delete_image_repository.md
index e0b6bb14c11c1222d51c6f30ee2b57990f429980..81d41292212ff929b54468e1520d95b6268a17e6 100644
--- a/docs/cmd/flux_delete_auto_image-repository.md
+++ b/docs/cmd/flux_delete_image_repository.md
@@ -1,27 +1,27 @@
-## flux delete auto image-repository
+## flux delete image repository
 
 Delete an ImageRepository object
 
 ### Synopsis
 
-The delete auto image-repository command deletes the given ImageRepository from the cluster.
+The delete image repository command deletes the given ImageRepository from the cluster.
 
 ```
-flux delete auto image-repository [name] [flags]
+flux delete image repository [name] [flags]
 ```
 
 ### Examples
 
 ```
   # Delete an image repository
-  flux delete auto image-repository alpine
+  flux delete image repository alpine
 
 ```
 
 ### Options
 
 ```
-  -h, --help   help for image-repository
+  -h, --help   help for repository
 ```
 
 ### Options inherited from parent commands
@@ -37,5 +37,5 @@ flux delete auto image-repository [name] [flags]
 
 ### SEE ALSO
 
-* [flux delete auto](flux_delete_auto.md)	 - Delete automation objects
+* [flux delete image](flux_delete_image.md)	 - Delete image automation objects
 
diff --git a/docs/cmd/flux_delete_auto_image-update.md b/docs/cmd/flux_delete_image_update.md
similarity index 66%
rename from docs/cmd/flux_delete_auto_image-update.md
rename to docs/cmd/flux_delete_image_update.md
index 983a6f272c928efd9d95341f392fdd5d4b315d1b..2f1edef0abad4c4c088c391899b6c6d93949b6e4 100644
--- a/docs/cmd/flux_delete_auto_image-update.md
+++ b/docs/cmd/flux_delete_image_update.md
@@ -1,27 +1,27 @@
-## flux delete auto image-update
+## flux delete image update
 
 Delete an ImageUpdateAutomation object
 
 ### Synopsis
 
-The delete auto image-update command deletes the given ImageUpdateAutomation from the cluster.
+The delete image update command deletes the given ImageUpdateAutomation from the cluster.
 
 ```
-flux delete auto image-update [name] [flags]
+flux delete image update [name] [flags]
 ```
 
 ### Examples
 
 ```
   # Delete an image update automation
-  flux delete auto image-update latest-images
+  flux delete image update latest-images
 
 ```
 
 ### Options
 
 ```
-  -h, --help   help for image-update
+  -h, --help   help for update
 ```
 
 ### Options inherited from parent commands
@@ -37,5 +37,5 @@ flux delete auto image-update [name] [flags]
 
 ### SEE ALSO
 
-* [flux delete auto](flux_delete_auto.md)	 - Delete automation objects
+* [flux delete image](flux_delete_image.md)	 - Delete image automation objects