diff --git a/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java b/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java
index de0f0ed3213..ed72a15c014 100644
--- a/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java
+++ b/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java
@@ -165,7 +165,7 @@
  * @author Khyrul Bashar
  */
 @SuppressWarnings({ "serial", "squid:MaximumInheritanceDepth", "squid:S1948" })
-@Command(name = "pdfdebugger", description = "Analyzes and inspects the internal structure of a PDF document")
+@Command(name = "debug", description = "Analyzes and inspects the internal structure of a PDF document")
 public class PDFDebugger extends JFrame implements Callable<Integer>, HyperlinkListener
 {
     private static Logger LOG; // needs late initialization
diff --git a/tools/src/main/java/org/apache/pdfbox/tools/DecompressObjectstreams.java b/tools/src/main/java/org/apache/pdfbox/tools/DecompressObjectstreams.java
index 6c31057ee9b..8c9f2266ef7 100644
--- a/tools/src/main/java/org/apache/pdfbox/tools/DecompressObjectstreams.java
+++ b/tools/src/main/java/org/apache/pdfbox/tools/DecompressObjectstreams.java
@@ -38,7 +38,7 @@
  * 
  * @author Adam Nichols
  */
-@Command(name = "DecompressObjectstreams", header = "Decompresses object streams in a PDF file.")
+@Command(name = "decompress", header = "Decompresses object streams in a PDF file.")
 public final class DecompressObjectstreams implements Callable<Integer>
 {
     // Expected for CLI app to write to System.out/System.err
diff --git a/tools/src/main/java/org/apache/pdfbox/tools/ExportFDF.java b/tools/src/main/java/org/apache/pdfbox/tools/ExportFDF.java
index 2e953d52caf..7f55b208420 100644
--- a/tools/src/main/java/org/apache/pdfbox/tools/ExportFDF.java
+++ b/tools/src/main/java/org/apache/pdfbox/tools/ExportFDF.java
@@ -36,7 +36,7 @@
  *
  * @author Ben Litchfield
  */
-@Command(name = "exportfdf", header = "Exports AcroForm form data to FDF", versionProvider = Version.class, mixinStandardHelpOptions = true)
+@Command(name = "export:fdf", header = "Exports AcroForm form data to FDF", versionProvider = Version.class, mixinStandardHelpOptions = true)
 public final class ExportFDF implements Callable<Integer>
 {
     // Expected for CLI app to write to System.out/System.err
diff --git a/tools/src/main/java/org/apache/pdfbox/tools/ExportXFDF.java b/tools/src/main/java/org/apache/pdfbox/tools/ExportXFDF.java
index fff7328f477..7dcc9c65d2a 100644
--- a/tools/src/main/java/org/apache/pdfbox/tools/ExportXFDF.java
+++ b/tools/src/main/java/org/apache/pdfbox/tools/ExportXFDF.java
@@ -37,7 +37,7 @@
  *
  * @author Ben Litchfield
  */
-@Command(name = "exportxfdf", header = "Exports AcroForm form data to XFDF", versionProvider = Version.class, mixinStandardHelpOptions = true)
+@Command(name = "export:xfdf", header = "Exports AcroForm form data to XFDF", versionProvider = Version.class, mixinStandardHelpOptions = true)
 public final class ExportXFDF implements Callable<Integer>
 {
     // Expected for CLI app to write to System.out/System.err
diff --git a/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java b/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java
index bb06d5ce4d6..7509a4443fa 100644
--- a/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java
+++ b/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java
@@ -66,7 +66,7 @@
  *
  * @author Ben Litchfield
  */
-@Command(name = "extractimages", header = "Extracts the images from a PDF document", versionProvider = Version.class, mixinStandardHelpOptions = true)
+@Command(name = "export:images", header = "Extracts the images from a PDF document", versionProvider = Version.class, mixinStandardHelpOptions = true)
 public final class ExtractImages implements Callable<Integer>
 {
     // Expected for CLI app to write to System.out/System.err
diff --git a/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java b/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java
index 1b4f7585409..3af0fe2a958 100644
--- a/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java
+++ b/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java
@@ -59,7 +59,7 @@
  * @author Ben Litchfield
  * @author Tilman Hausherr
  */
-@Command(name = "extracttext", header = "Extracts the text from a PDF document", versionProvider = Version.class, mixinStandardHelpOptions = true)
+@Command(name = "export:text", header = "Extracts the text from a PDF document", versionProvider = Version.class, mixinStandardHelpOptions = true)
 public final class ExtractText  implements Callable<Integer>
 {
     private static final Logger LOG = LogManager.getLogger(ExtractText.class);
diff --git a/tools/src/main/java/org/apache/pdfbox/tools/ExtractXMP.java b/tools/src/main/java/org/apache/pdfbox/tools/ExtractXMP.java
index 0804014c3bf..bd23ccb5484 100644
--- a/tools/src/main/java/org/apache/pdfbox/tools/ExtractXMP.java
+++ b/tools/src/main/java/org/apache/pdfbox/tools/ExtractXMP.java
@@ -37,7 +37,7 @@
  *
  * @author Tilman Hausherr
  */
-@CommandLine.Command(name = "extractxmp", header = "Extracts the xmp stream from a PDF document", versionProvider = Version.class, mixinStandardHelpOptions = true)
+@CommandLine.Command(name = "extract:xmp", header = "Extracts the xmp stream from a PDF document", versionProvider = Version.class, mixinStandardHelpOptions = true)
 public class ExtractXMP implements Callable<Integer>
 {
     // Expected for CLI app to write to System.out/System.err
diff --git a/tools/src/main/java/org/apache/pdfbox/tools/ImageToPDF.java b/tools/src/main/java/org/apache/pdfbox/tools/ImageToPDF.java
index c65a012a984..cb20f293632 100644
--- a/tools/src/main/java/org/apache/pdfbox/tools/ImageToPDF.java
+++ b/tools/src/main/java/org/apache/pdfbox/tools/ImageToPDF.java
@@ -34,7 +34,7 @@
 /**
  * Create a PDF document from images.
  */
-@Command(name = "imagetopdf", header = "Creates a PDF document from images", versionProvider = Version.class, mixinStandardHelpOptions = true)
+@Command(name = "fromimage", header = "Creates a PDF document from images", versionProvider = Version.class, mixinStandardHelpOptions = true)
 public final class ImageToPDF implements Callable<Integer>
 {
     private PDRectangle mediaBox = PDRectangle.LETTER;
diff --git a/tools/src/main/java/org/apache/pdfbox/tools/ImportFDF.java b/tools/src/main/java/org/apache/pdfbox/tools/ImportFDF.java
index d807ae69eb7..f723c147e88 100644
--- a/tools/src/main/java/org/apache/pdfbox/tools/ImportFDF.java
+++ b/tools/src/main/java/org/apache/pdfbox/tools/ImportFDF.java
@@ -37,7 +37,7 @@
  *
  * @author Ben Litchfield
  */
-@Command(name = "importfdf", header = "Imports AcroForm form data from FDF", versionProvider = Version.class, mixinStandardHelpOptions = true)
+@Command(name = "import:fdf", header = "Imports AcroForm form data from FDF", versionProvider = Version.class, mixinStandardHelpOptions = true)
 public class ImportFDF implements Callable<Integer>
 {
     // Expected for CLI app to write to System.out/System.err
diff --git a/tools/src/main/java/org/apache/pdfbox/tools/ImportXFDF.java b/tools/src/main/java/org/apache/pdfbox/tools/ImportXFDF.java
index 0d1f3fd9674..14d897065b0 100644
--- a/tools/src/main/java/org/apache/pdfbox/tools/ImportXFDF.java
+++ b/tools/src/main/java/org/apache/pdfbox/tools/ImportXFDF.java
@@ -38,7 +38,7 @@
  *
  * @author Ben Litchfield
  */
-@Command(name = "importxfdf", header = "Imports AcroForm form data from XFDF", versionProvider = Version.class, mixinStandardHelpOptions = true)
+@Command(name = "import:xfdf", header = "Imports AcroForm form data from XFDF", versionProvider = Version.class, mixinStandardHelpOptions = true)
 public class ImportXFDF implements Callable<Integer>
 {
     // Expected for CLI app to write to System.out/System.err
diff --git a/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java b/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java
index 125b965f667..db22bcfc640 100644
--- a/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java
+++ b/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java
@@ -38,7 +38,7 @@
  * Based on code contributed by Balazs Jerk. 
  * 
  */
-@Command(name = "overlaypdf", header = "Adds an overlay to a PDF document", versionProvider = Version.class, mixinStandardHelpOptions = true)
+@Command(name = "overlay", header = "Adds an overlay to a PDF document", versionProvider = Version.class, mixinStandardHelpOptions = true)
 public final class OverlayPDF implements Callable<Integer>
 {
     // Expected for CLI app to write to System.out/System.err
diff --git a/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java b/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java
index 2d23bd52ef9..4a5349a9796 100644
--- a/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java
+++ b/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java
@@ -56,6 +56,7 @@ public static void main(String[] args)
         commandLine.addSubcommand("decrypt", Decrypt.class);
         commandLine.addSubcommand("encrypt", Encrypt.class);
         commandLine.addSubcommand("decode", WriteDecodedDoc.class);
+        commandLine.addSubcommand("decompress", DecompressObjectstreams.class);
         commandLine.addSubcommand("export:images", ExtractImages.class);
         commandLine.addSubcommand("export:xmp", ExtractXMP.class);
         commandLine.addSubcommand("export:text", ExtractText.class);
diff --git a/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java b/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java
index 424805bd0d1..5b50e15da54 100644
--- a/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java
+++ b/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java
@@ -38,7 +38,7 @@
  *
  * @author Ben Litchfield
  */
-@Command(name = "pdfsplit", header = "Splits a PDF document into number of new documents", versionProvider = Version.class, mixinStandardHelpOptions = true)
+@Command(name = "split", header = "Splits a PDF document into number of new documents", versionProvider = Version.class, mixinStandardHelpOptions = true)
 public final class PDFSplit implements Callable<Integer>
 {
     // Expected for CLI app to write to System.out/System.err
diff --git a/tools/src/main/java/org/apache/pdfbox/tools/PDFToImage.java b/tools/src/main/java/org/apache/pdfbox/tools/PDFToImage.java
index c5d28415400..9338cd96d1c 100644
--- a/tools/src/main/java/org/apache/pdfbox/tools/PDFToImage.java
+++ b/tools/src/main/java/org/apache/pdfbox/tools/PDFToImage.java
@@ -46,7 +46,7 @@
  *
  * @author Ben Litchfield
  */
-@Command(name = "pdftoimage", header = "Converts a PDF document to image(s)", versionProvider = Version.class, mixinStandardHelpOptions = true)
+@Command(name = "render", header = "Converts a PDF document to image(s)", versionProvider = Version.class, mixinStandardHelpOptions = true)
 public final class PDFToImage implements Callable<Integer>
 {
     // Expected for CLI app to write to System.out/System.err
diff --git a/tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java b/tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java
index 317a3246a15..a6e4e0dc8cd 100644
--- a/tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java
+++ b/tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java
@@ -47,7 +47,7 @@
  *
  * @author Ben Litchfield
  */
-@Command(name = "texttopdf", header = "Creates a PDF document from text", versionProvider = Version.class, mixinStandardHelpOptions = true)
+@Command(name = "fromtext", header = "Creates a PDF document from text", versionProvider = Version.class, mixinStandardHelpOptions = true)
 public class TextToPDF implements Callable<Integer>
 {
     /**
diff --git a/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java b/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java
index 7bcb39af244..f4c81a57a24 100644
--- a/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java
+++ b/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java
@@ -42,7 +42,7 @@
  *
  * @author Michael Traut
  */
-@Command(name = "writedecodeddoc", header = "Writes a PDF document with all streams decoded", versionProvider = Version.class, mixinStandardHelpOptions = true)
+@Command(name = "decode", header = "Writes a PDF document with all streams decoded", versionProvider = Version.class, mixinStandardHelpOptions = true)
 public class WriteDecodedDoc implements Callable<Integer>
 {
     // Expected for CLI app to write to System.out/System.err