diff --git a/CHANGES.txt b/CHANGES.txt
index 146ee73f9b..c39f1194ed 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -36,6 +36,7 @@ Merged from 2.2:
  * Expose phi values from failure detector via JMX and tweak debug
    and trace logging (CASSANDRA-9526)
 Merged from 2.1:
+ * (cqlsh) fix COPY using wrong variable name for time_format (CASSANDRA-10633)
  * Do not run SizeEstimatesRecorder if a node is not a member of the ring (CASSANDRA-9912)
  * Improve handling of dead nodes in gossip (CASSANDRA-10298)
  * Fix logback-tools.xml incorrectly configured for outputing to System.err
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 23d4444cec..eee8851684 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -1748,7 +1748,7 @@ class Shell(cmd.Cmd):
           HEADER=false            - whether to ignore the first line
           NULL=''                 - string that represents a null value
           ENCODING='utf8'         - encoding for CSV output (COPY TO only)
-          TIME_FORMAT=            - timestamp strftime format (COPY TO only)
+          TIMEFORMAT=             - timestamp strftime format (COPY TO only)
             '%Y-%m-%d %H:%M:%S%z'   defaults to time_format value in cqlshrc
 
         When entering CSV data on STDIN, you can use the sequence "\."
@@ -1933,7 +1933,7 @@ class Shell(cmd.Cmd):
         encoding = opts.pop('encoding', 'utf8')
         nullval = opts.pop('null', '')
         header = bool(opts.pop('header', '').lower() == 'true')
-        timestamp_format = opts.pop('time_format', self.display_timestamp_format)
+        timestamp_format = opts.pop('timeformat', self.display_timestamp_format)
         if dialect_options['quotechar'] == dialect_options['escapechar']:
             dialect_options['doublequote'] = True
             del dialect_options['escapechar']