diff --git a/freqtrade/commands/optimize_commands.py b/freqtrade/commands/optimize_commands.py
index b416c814f..2238c5e0a 100644
--- a/freqtrade/commands/optimize_commands.py
+++ b/freqtrade/commands/optimize_commands.py
@@ -140,7 +140,7 @@ def start_lookahead_analysis(args: Dict[str, Any]) -> None:
     :param args: Cli args from Arguments()
     :return: None
     """
-    from freqtrade.optimize.analysis.lookahead_analysis_helpers import LookaheadAnalysisSubFunctions
+    from freqtrade.optimize.analysis.lookahead_helpers import LookaheadAnalysisSubFunctions
 
     config = setup_utils_configuration(args, RunMode.UTIL_NO_EXCHANGE)
     LookaheadAnalysisSubFunctions.start(config)
@@ -152,7 +152,7 @@ def start_recursive_analysis(args: Dict[str, Any]) -> None:
     :param args: Cli args from Arguments()
     :return: None
     """
-    from freqtrade.optimize.analysis.recursive_analysis_helpers import RecursiveAnalysisSubFunctions
+    from freqtrade.optimize.analysis.recursive_helpers import RecursiveAnalysisSubFunctions
 
     config = setup_utils_configuration(args, RunMode.UTIL_NO_EXCHANGE)
     RecursiveAnalysisSubFunctions.start(config)
diff --git a/freqtrade/optimize/analysis/lookahead_analysis.py b/freqtrade/optimize/analysis/lookahead.py
similarity index 100%
rename from freqtrade/optimize/analysis/lookahead_analysis.py
rename to freqtrade/optimize/analysis/lookahead.py
diff --git a/freqtrade/optimize/analysis/lookahead_analysis_helpers.py b/freqtrade/optimize/analysis/lookahead_helpers.py
similarity index 99%
rename from freqtrade/optimize/analysis/lookahead_analysis_helpers.py
rename to freqtrade/optimize/analysis/lookahead_helpers.py
index f8ddd73f5..1d2b9db48 100644
--- a/freqtrade/optimize/analysis/lookahead_analysis_helpers.py
+++ b/freqtrade/optimize/analysis/lookahead_helpers.py
@@ -7,7 +7,7 @@ import pandas as pd
 
 from freqtrade.constants import Config
 from freqtrade.exceptions import OperationalException
-from freqtrade.optimize.analysis.lookahead_analysis import LookaheadAnalysis
+from freqtrade.optimize.analysis.lookahead import LookaheadAnalysis
 from freqtrade.resolvers import StrategyResolver
 
 
diff --git a/freqtrade/optimize/analysis/recursive_analysis.py b/freqtrade/optimize/analysis/recursive.py
similarity index 100%
rename from freqtrade/optimize/analysis/recursive_analysis.py
rename to freqtrade/optimize/analysis/recursive.py
diff --git a/freqtrade/optimize/analysis/recursive_analysis_helpers.py b/freqtrade/optimize/analysis/recursive_helpers.py
similarity index 98%
rename from freqtrade/optimize/analysis/recursive_analysis_helpers.py
rename to freqtrade/optimize/analysis/recursive_helpers.py
index 3fff2125c..58983b245 100644
--- a/freqtrade/optimize/analysis/recursive_analysis_helpers.py
+++ b/freqtrade/optimize/analysis/recursive_helpers.py
@@ -5,7 +5,7 @@ from typing import Any, Dict, List
 
 from freqtrade.constants import Config
 from freqtrade.exceptions import OperationalException
-from freqtrade.optimize.analysis.recursive_analysis import RecursiveAnalysis
+from freqtrade.optimize.analysis.recursive import RecursiveAnalysis
 from freqtrade.resolvers import StrategyResolver