diff --git a/docs/data-download.md b/docs/data-download.md
index c5fb744ab..f747123d0 100644
--- a/docs/data-download.md
+++ b/docs/data-download.md
@@ -78,9 +78,9 @@ optional arguments:
                         Show profits for only these pairs. Pairs are space-
                         separated.
   --format-from {json,jsongz}
-                        Source format for data conversation.
+                        Source format for data conversion.
   --format-to {json,jsongz}
-                        Destination format for data conversation.
+                        Destination format for data conversion.
   --erase               Clean all existing data for the selected
                         exchange/pairs/timeframes.
   -t {1m,3m,5m,15m,30m,1h,2h,4h,6h,8h,12h,1d,3d,1w} [{1m,3m,5m,15m,30m,1h,2h,4h,6h,8h,12h,1d,3d,1w} ...], --timeframes {1m,3m,5m,15m,30m,1h,2h,4h,6h,8h,12h,1d,3d,1w} [{1m,3m,5m,15m,30m,1h,2h,4h,6h,8h,12h,1d,3d,1w} ...]
@@ -127,9 +127,9 @@ optional arguments:
                         Show profits for only these pairs. Pairs are space-
                         separated.
   --format-from {json,jsongz}
-                        Source format for data conversation.
+                        Source format for data conversion.
   --format-to {json,jsongz}
-                        Destination format for data conversation.
+                        Destination format for data conversion.
   --erase               Clean all existing data for the selected
                         exchange/pairs/timeframes.
 
diff --git a/freqtrade/configuration/arguments.py b/freqtrade/configuration/arguments.py
index 2b9b362bf..718b6dedc 100644
--- a/freqtrade/configuration/arguments.py
+++ b/freqtrade/configuration/arguments.py
@@ -264,14 +264,14 @@ class Arguments:
         convert_data_cmd.set_defaults(func=partial(start_convert_data, ohlcv=True))
         self._build_args(optionlist=ARGS_CONVERT_DATA_OHLCV, parser=convert_data_cmd)
 
-        # Add convert-data subcommand
-        convert_data_cmd = subparsers.add_parser(
+        # Add convert-trade-data subcommand
+        convert_trade_data_cmd = subparsers.add_parser(
             'convert-trade-data',
             help='Convert trade-data from one format to another.',
             parents=[_common_parser],
         )
-        convert_data_cmd.set_defaults(func=partial(start_convert_data, ohlcv=False))
-        self._build_args(optionlist=ARGS_CONVERT_DATA, parser=convert_data_cmd)
+        convert_trade_data_cmd.set_defaults(func=partial(start_convert_data, ohlcv=False))
+        self._build_args(optionlist=ARGS_CONVERT_DATA, parser=convert_trade_data_cmd)
 
         # Add Plotting subcommand
         plot_dataframe_cmd = subparsers.add_parser(
diff --git a/freqtrade/configuration/cli_options.py b/freqtrade/configuration/cli_options.py
index c80bea393..0289d3fd0 100644
--- a/freqtrade/configuration/cli_options.py
+++ b/freqtrade/configuration/cli_options.py
@@ -334,13 +334,13 @@ AVAILABLE_CLI_OPTIONS = {
     ),
     "format_from": Arg(
         '--format-from',
-        help='Source format for data conversation.',
+        help='Source format for data conversion.',
         choices=constants.AVAILABLE_DATAHANDLERS,
         required=True,
     ),
     "format_to": Arg(
         '--format-to',
-        help='Destination format for data conversation.',
+        help='Destination format for data conversion.',
         choices=constants.AVAILABLE_DATAHANDLERS,
         required=True,
     ),
diff --git a/freqtrade/data/history/history_utils.py b/freqtrade/data/history/history_utils.py
index 2d11b229b..c0578a32b 100644
--- a/freqtrade/data/history/history_utils.py
+++ b/freqtrade/data/history/history_utils.py
@@ -132,7 +132,7 @@ def _load_cached_data_for_updating(pair: str, timeframe: str, timerange: Optiona
     start = None
     if timerange:
         if timerange.starttype == 'date':
-            # TODO: convert to date for conversation
+            # TODO: convert to date for conversion
             start = datetime.fromtimestamp(timerange.startts, tz=timezone.utc)
 
     # Intentionally don't pass timerange in - since we need to load the full dataset.
diff --git a/freqtrade/data/history/idatahandler.py b/freqtrade/data/history/idatahandler.py
index 20022fc38..df03e7713 100644
--- a/freqtrade/data/history/idatahandler.py
+++ b/freqtrade/data/history/idatahandler.py
@@ -52,7 +52,7 @@ class IDataHandler(ABC):
                     ) -> DataFrame:
         """
         Internal method used to load data for one pair from disk.
-        Implements the loading and conversation to a Pandas dataframe.
+        Implements the loading and conversion to a Pandas dataframe.
         Timerange trimming and dataframe validation happens outside of this method.
         :param pair: Pair to load data
         :param timeframe: Ticker timeframe (e.g. "5m")
diff --git a/freqtrade/data/history/jsondatahandler.py b/freqtrade/data/history/jsondatahandler.py
index dcfc249aa..7f0643862 100644
--- a/freqtrade/data/history/jsondatahandler.py
+++ b/freqtrade/data/history/jsondatahandler.py
@@ -57,7 +57,7 @@ class JsonDataHandler(IDataHandler):
                     ) -> DataFrame:
         """
         Internal method used to load data for one pair from disk.
-        Implements the loading and conversation to a Pandas dataframe.
+        Implements the loading and conversion to a Pandas dataframe.
         Timerange trimming and dataframe validation happens outside of this method.
         :param pair: Pair to load data
         :param timeframe: Ticker timeframe (e.g. "5m")