diff --git a/integration-test/src/test/java/org/apache/iotdb/tools/it/ExportTsFileTestIT.java b/integration-test/src/test/java/org/apache/iotdb/tools/it/ExportTsFileTestIT.java
index 71a3d62a382a..5994d4d554ee 100644
--- a/integration-test/src/test/java/org/apache/iotdb/tools/it/ExportTsFileTestIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/tools/it/ExportTsFileTestIT.java
@@ -90,7 +90,7 @@ protected void testOnWindows() throws IOException {
             "root",
             "-pw",
             "root",
-            "-td",
+            "-t",
             "target",
             "-q",
             "select * from root.test.t2 where time > 1 and time < 1000000000000",
@@ -116,7 +116,7 @@ protected void testOnWindows() throws IOException {
             "root",
             "-pw",
             "root",
-            "-td",
+            "-t",
             "target",
             "-q",
             "select * from root.test.t2 where time > 1 and time < 1000000000000",
@@ -143,7 +143,7 @@ protected void testOnUnix() throws IOException {
             "root",
             "-pw",
             "root",
-            "-td",
+            "-t",
             "target",
             "-q",
             "select * from root.**");
@@ -166,7 +166,7 @@ protected void testOnUnix() throws IOException {
             "root",
             "-pw",
             "root",
-            "-td",
+            "-t",
             "target",
             "-q",
             "select * from root.**");
diff --git a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/AbstractTsFileTool.java b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/AbstractTsFileTool.java
index 4a4ee1dbb11f..fe8691ddf8b6 100644
--- a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/AbstractTsFileTool.java
+++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/AbstractTsFileTool.java
@@ -42,8 +42,8 @@ public abstract class AbstractTsFileTool {
   protected static final String USERNAME_ARGS = "u";
   protected static final String USERNAME_NAME = "username";
 
-  protected static final String TIMEOUT_ARGS = "t";
-  protected static final String TIMEOUT_NAME = "timeout";
+  protected static final String TIMEOUT_ARGS = "timeout";
+  protected static final String TIMEOUT_NAME = "queryTimeout";
   protected static final int MAX_HELP_CONSOLE_WIDTH = 92;
   protected static final int CODE_OK = 0;
   protected static final int CODE_ERROR = 1;
@@ -109,7 +109,7 @@ protected static void createBaseOptions() {
             .longOpt(HOST_NAME)
             .argName(HOST_NAME)
             .hasArg()
-            .desc("Host Name")
+            .desc("Host Name (optional)")
             .build();
     options.addOption(opHost);
 
@@ -118,7 +118,7 @@ protected static void createBaseOptions() {
             .longOpt(PORT_NAME)
             .argName(PORT_NAME)
             .hasArg()
-            .desc("Port")
+            .desc("Port (optional)")
             .build();
     options.addOption(opPort);
 
@@ -127,7 +127,7 @@ protected static void createBaseOptions() {
             .longOpt(USERNAME_NAME)
             .argName(USERNAME_NAME)
             .hasArg()
-            .desc("Username")
+            .desc("Username (optional)")
             .build();
     options.addOption(opUsername);
 
@@ -137,7 +137,7 @@ protected static void createBaseOptions() {
             .optionalArg(true)
             .argName(PW_NAME)
             .hasArg()
-            .desc("Password")
+            .desc("Password (optional)")
             .build();
     options.addOption(opPassword);
   }
diff --git a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportTsFile.java b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportTsFile.java
index 5815362ac1ec..723e410741e5 100644
--- a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportTsFile.java
+++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportTsFile.java
@@ -61,13 +61,13 @@
 
 public class ExportTsFile extends AbstractTsFileTool {
 
-  private static final String TARGET_DIR_ARGS = "td";
+  private static final String TARGET_DIR_ARGS = "t";
   private static final String TARGET_DIR_NAME = "targetDirectory";
-  private static final String TARGET_FILE_ARGS = "f";
-  private static final String TARGET_FILE_NAME = "targetFile";
+  private static final String TARGET_FILE_ARGS = "tfn";
+  private static final String TARGET_FILE_NAME = "targetFileName";
 
   private static final String SQL_FILE_ARGS = "s";
-  private static final String SQL_FILE_NAME = "sqlfile";
+  private static final String SQL_FILE_NAME = "sourceSqlFile";
   private static final String QUERY_COMMAND_ARGS = "q";
   private static final String QUERY_COMMAND_NAME = "queryCommand";
   private static final String DUMP_FILE_NAME_DEFAULT = "dump";
@@ -265,7 +265,7 @@ private static void createOptions() {
 
     Option opTimeout =
         Option.builder(TIMEOUT_ARGS)
-            .longOpt(TIMEOUT_NAME)
+            .argName(TIMEOUT_NAME)
             .hasArg()
             .desc("Timeout for session query")
             .build();