diff --git a/tools/win/gen_features.bat b/tools/win/gen_features.bat
index f9bddc30b6..f2605484af 100644
--- a/tools/win/gen_features.bat
+++ b/tools/win/gen_features.bat
@@ -1,3 +1,3 @@
 call set_vars.bat %1 %2
 
-%UNZIP_TOOL% -dc %OSM_FILE% | %GENERATOR_TOOL% --generate_features=true --use_light_nodes=true --intermediate_data_path=D:\Temp\ --output=%2 --bucketing_level=0
+%UNZIP_TOOL% -dc %OSM_FILE% | %GENERATOR_TOOL% --generate_features=true --use_light_nodes=true --intermediate_data_path=D:\Temp\ --output=%2
\ No newline at end of file
diff --git a/tools/win/gen_features_world.bat b/tools/win/gen_features_world.bat
index 865ebb150d..1aefd9f67f 100644
--- a/tools/win/gen_features_world.bat
+++ b/tools/win/gen_features_world.bat
@@ -1,3 +1,3 @@
 call set_vars.bat %1 %2
 
-%UNZIP_TOOL% -dc %OSM_FILE% | %GENERATOR_TOOL% --generate_features=true --use_light_nodes=true --split_by_polygons=true --generate_world_scale=9 --merge_coastlines=true --intermediate_data_path=D:\Temp\ --bucketing_level=0
+%UNZIP_TOOL% -dc %OSM_FILE% | %GENERATOR_TOOL% --generate_features=true --use_light_nodes=true --split_by_polygons=true --generate_world=true --intermediate_data_path=D:\Temp\
diff --git a/tools/win/gen_geometry.bat b/tools/win/gen_geometry.bat
index 0dd6787884..291fa36727 100644
--- a/tools/win/gen_geometry.bat
+++ b/tools/win/gen_geometry.bat
@@ -1,3 +1,3 @@
 call set_vars.bat %1 %2
 
-%GENERATOR_TOOL% --generate_geometry=true --output=%2 --bucketing_level=0
+%GENERATOR_TOOL% --generate_geometry=true --output=%2
\ No newline at end of file
diff --git a/tools/win/gen_geometry_world.bat b/tools/win/gen_geometry_world.bat
index 625fd6dc5f..5def349612 100644
--- a/tools/win/gen_geometry_world.bat
+++ b/tools/win/gen_geometry_world.bat
@@ -1,3 +1,3 @@
 call set_vars.bat %1 %2
 
-%GENERATOR_TOOL% --generate_geometry=true --output=World --bucketing_level=0
+%GENERATOR_TOOL% --generate_geometry=true --generate_world=true --output=World
diff --git a/tools/win/gen_index.bat b/tools/win/gen_index.bat
index 48013994ec..811099d7ae 100644
--- a/tools/win/gen_index.bat
+++ b/tools/win/gen_index.bat
@@ -1,3 +1,3 @@
 call set_vars.bat %1 %2
 
-%GENERATOR_TOOL% --generate_index=true --intermediate_data_path=D:\Temp\ --output=%2 --bucketing_level=0
+%GENERATOR_TOOL% --generate_index=true --intermediate_data_path=D:\Temp\ --output=%2
\ No newline at end of file
diff --git a/tools/win/gen_index_world.bat b/tools/win/gen_index_world.bat
index 3a8906debd..28d45bb862 100644
--- a/tools/win/gen_index_world.bat
+++ b/tools/win/gen_index_world.bat
@@ -1,3 +1,3 @@
 call set_vars.bat %1 %2
 
-%GENERATOR_TOOL% --generate_index=true --intermediate_data_path=D:\Temp\ --output=World --bucketing_level=0
+%GENERATOR_TOOL% --generate_index=true --intermediate_data_path=D:\Temp\ --output=World