diff --git a/src/data_handling/__init__.py b/src/data_handling/__init__.py
index 5139d13da91025dad15db04fdfea34309c4e28ff..198147842dc3fe2a606d71bbbeed479148824124 100644
--- a/src/data_handling/__init__.py
+++ b/src/data_handling/__init__.py
@@ -10,6 +10,6 @@ __date__ = '2020-04-17'
 
 
 from .bootstraps import BootStraps
-from .data_preparation import DataPrep
+from .data_preparation_join import DataPrep
 from .data_generator import DataGenerator
 from .data_distributor import Distributor
diff --git a/src/data_handling/data_generator.py b/src/data_handling/data_generator.py
index 6747e82e0da2d1a68c99a09d75c76cdcd53a05ba..672ef8a1355441f2481bbf41a40cc951f334a30f 100644
--- a/src/data_handling/data_generator.py
+++ b/src/data_handling/data_generator.py
@@ -13,7 +13,7 @@ import keras
 import xarray as xr
 
 from src import helpers
-from src.data_handling.data_preparation import DataPrep
+from src.data_handling.data_preparation_join import DataPrep
 from src.helpers.join import EmptyQueryResult
 
 number = Union[float, int]