diff --git a/tools/mkspecs/setenv_iphone.sh b/tools/mkspecs/setenv_iphone.sh
index 9fa4317fa5..7fa9e067d9 100755
--- a/tools/mkspecs/setenv_iphone.sh
+++ b/tools/mkspecs/setenv_iphone.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-BASE_SDK_VERSION=4.0
+BASE_SDK_VERSION=4.3
 DEV_ROOT="/Developer/Platforms/iPhoneOS.platform/Developer"
 SDK_ROOT="$DEV_ROOT/SDKs/iPhoneOS${BASE_SDK_VERSION}.sdk"
 # minimum supported iphone os version at runtime
@@ -12,8 +12,8 @@ export PATH=$DEV_ROOT/usr/bin:/Developer/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin
 export CC="gcc-4.2"
 export CXX="g++-4.2"
 
-C_AND_CXX_FLAGS="-arch armv6 -fmessage-length=0 -pipe -fpascal-strings -Wall \
-  -fvisibility=hidden -mthumb -miphoneos-version-min=$IOS_VERSION -gdwarf-2 \
+C_AND_CXX_FLAGS="-arch armv6 -arch armv7 -fmessage-length=0 -pipe -fpascal-strings -Wall \
+  -fvisibility=hidden -mno-thumb -miphoneos-version-min=$IOS_VERSION -gdwarf-2 \
   --sysroot=$SDK_ROOT -isystem $SDK_ROOT/usr/include -iwithsysroot $SDK_ROOT"
 
 export CFLAGS="$C_AND_CXX_FLAGS -std=c99"
@@ -22,5 +22,5 @@ export CXXFLAGS="$C_AND_CXX_FLAGS -fvisibility-inlines-hidden"
 # linker settings
 export IPHONEOS_DEPLOYMENT_TARGET=$IOS_VERSION
 # just to mention - this flag is passed to libtool, not to gcc
-LIBTOOL_FLAGS="-arch_only armv6 -syslibroot $SDK_ROOT"
+LIBTOOL_FLAGS="-syslibroot $SDK_ROOT"
 LDFLAGS="-L$SDK_ROOT/usr/lib"
diff --git a/tools/mkspecs/setenv_iphonesim.sh b/tools/mkspecs/setenv_iphonesim.sh
index d24b2c5069..bb87b45a1c 100755
--- a/tools/mkspecs/setenv_iphonesim.sh
+++ b/tools/mkspecs/setenv_iphonesim.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-BASE_SDK_VERSION=4.0
+BASE_SDK_VERSION=4.3
 DEV_ROOT="/Developer/Platforms/iPhoneSimulator.platform/Developer"
 SDK_ROOT="$DEV_ROOT/SDKs/iPhoneSimulator${BASE_SDK_VERSION}.sdk"
 # minimum supported iphone os version at runtime
diff --git a/tools/unix/build_common_planet.sh b/tools/unix/build_common_planet.sh
index faf9c9991e..4e86a4eb6d 100755
--- a/tools/unix/build_common_planet.sh
+++ b/tools/unix/build_common_planet.sh
@@ -57,20 +57,20 @@ fi
 # determine script path
 MY_PATH=`dirname $0`
 
-# find indexer_tool
-IT_PATHS_ARRAY=(  "$MY_PATH/../../../omim-build-release/out/release/indexer_tool" \
-                  "$MY_PATH/../../out/release/indexer_tool" )
+# find generator_tool
+IT_PATHS_ARRAY=(  "$MY_PATH/../../../omim-build-release/out/release/generator_tool" \
+                  "$MY_PATH/../../out/release/generator_tool" )
 
 for i in {0..1}; do
   if [ -x ${IT_PATHS_ARRAY[i]} ]; then
-    INDEXER_TOOL=${IT_PATHS_ARRAY[i]}
-    echo TOOL: $INDEXER_TOOL
+    GENERATOR_TOOL=${IT_PATHS_ARRAY[i]}
+    echo TOOL: $GENERATOR_TOOL
     break
   fi
 done
 
-if [[ ! -n $INDEXER_TOOL ]]; then
-  echo 'No indexer_tool found, please build omim-build-release or omim/out/release'
+if [[ ! -n $GENERATOR_TOOL ]]; then
+  echo 'No generator_tool found, please build omim-build-release or omim/out/release'
   echo ""
   Usage
 fi
@@ -102,13 +102,13 @@ fi
 # skip 1st pass if intermediate data path was given
 if [ $# -lt 3 ]; then
   # 1st pass - not paralleled
-  $PV $OSM_BZ2 | bzip2 -d | $INDEXER_TOOL --intermediate_data_path=$TMPDIR \
+  $PV $OSM_BZ2 | bzip2 -d | $GENERATOR_TOOL --intermediate_data_path=$TMPDIR \
     --use_light_nodes=$LIGHT_NODES \
     --preprocess_xml
 fi
 
 # 2nd pass - not paralleled
-$PV $OSM_BZ2 | bzip2 -d | $INDEXER_TOOL --intermediate_data_path=$TMPDIR \
+$PV $OSM_BZ2 | bzip2 -d | $GENERATOR_TOOL --intermediate_data_path=$TMPDIR \
   --use_light_nodes=$LIGHT_NODES --bucketing_level=$BUCKETING_LEVEL \
   --generate_features --generate_world_scale=5 \
   --data_path=$DATA_PATH
@@ -119,7 +119,7 @@ for file in $DATA_PATH/*.mwm; do
     filename=$(basename "$file")
     extension="${filename##*.}"
     filename="${filename%.*}"
-    $INDEXER_TOOL -output="$filename" -data_path=$DATA_PATH -generate_geometry -sort_features -generate_index -intermediate_data_path=$TMPDIR &
+    $GENERATOR_TOOL -output="$filename" -data_path=$DATA_PATH -generate_geometry -sort_features -generate_index -intermediate_data_path=$TMPDIR &
     forky $PROCESSORS
   fi
 done
diff --git a/tools/unix/make_index_of.sh b/tools/unix/make_index_of.sh
index 32cfcbbc5e..22f95ffc38 100755
--- a/tools/unix/make_index_of.sh
+++ b/tools/unix/make_index_of.sh
@@ -38,31 +38,31 @@ fi
 # determine script path
 MY_PATH=`dirname $0`
 
-# find indexer_tool
+# find generator_tool
 # check if user specified build suffix parameter
 if [ $# -ge 3 ]; then
   IT_ARR_SIZE=4
-  IT_PATHS_ARRAY=(  "$MY_PATH/../../../omim-build-$3/out/release/indexer_tool" \
-                    "$MY_PATH/../../../$3/out/release/indexer_tool" \
-                    "$MY_PATH/../../../omim-build-$3/out/debug/indexer_tool" \
-                    "$MY_PATH/../../../$3/out/debug/indexer_tool" )
+  IT_PATHS_ARRAY=(  "$MY_PATH/../../../omim-build-$3/out/release/generator_tool" \
+                    "$MY_PATH/../../../$3/out/release/generator_tool" \
+                    "$MY_PATH/../../../omim-build-$3/out/debug/generator_tool" \
+                    "$MY_PATH/../../../$3/out/debug/generator_tool" )
 else
   IT_ARR_SIZE=2
-  IT_PATHS_ARRAY=(  "$MY_PATH/../../../omim-build-release/out/release/indexer_tool" \
-                    "$MY_PATH/../../../omim-build-debug/out/debug/indexer_tool" \
+  IT_PATHS_ARRAY=(  "$MY_PATH/../../../omim-build-release/out/release/generator_tool" \
+                    "$MY_PATH/../../../omim-build-debug/out/debug/generator_tool" \
                     "stub-for-for-cycle" \
                     "stub-for-for-cycle" )
 fi
 for i in {0..3}; do
   if [ -x ${IT_PATHS_ARRAY[i]} ]; then
-    INDEXER_TOOL=${IT_PATHS_ARRAY[i]}
-    echo TOOL: $INDEXER_TOOL
+    GENERATOR_TOOL=${IT_PATHS_ARRAY[i]}
+    echo TOOL: $GENERATOR_TOOL
     break
   fi
 done
 
-if [[ ! -n $INDEXER_TOOL ]]; then
-  echo 'No indexer_tool found, please build omim-build-release or omim-build-debug'
+if [[ ! -n $GENERATOR_TOOL ]]; then
+  echo 'No generator_tool found, please build omim-build-release or omim-build-debug'
   echo 'or specify omim-build-[suffix] or [shadow directory] as 3rd script parameter'
   Usage
 fi
@@ -103,10 +103,10 @@ else
   LIGHT_NODES=true
 fi
 
-$PV $OSM_BZ2 | bzip2 -d | $INDEXER_TOOL --intermediate_data_path=$TMPDIR \
+$PV $OSM_BZ2 | bzip2 -d | $GENERATOR_TOOL --intermediate_data_path=$TMPDIR \
   --use_light_nodes=$LIGHT_NODES \
   --preprocess_xml
 
-$PV $OSM_BZ2 | bzip2 -d | $INDEXER_TOOL --intermediate_data_path=$TMPDIR \
+$PV $OSM_BZ2 | bzip2 -d | $GENERATOR_TOOL --intermediate_data_path=$TMPDIR \
   --use_light_nodes=$LIGHT_NODES \
   --generate_features --sort_features --generate_geometry --generate_index --output=$1 --bucketing_level=$DEFAULT_BUCKETING_LEVEL
diff --git a/tools/unix/make_index_of_vng.sh b/tools/unix/make_index_of_vng.sh
index 8afa3bc620..a011b7f87c 100755
--- a/tools/unix/make_index_of_vng.sh
+++ b/tools/unix/make_index_of_vng.sh
@@ -1,6 +1,6 @@
 set -e -u -x
 MY_PATH=`echo $0 | grep -o '.*/'`
-INDEXER_TOOL=$MY_PATH../../../omim-build-$1/out/$1/indexer_tool
+GENERATOR_TOOL=$MY_PATH../../../omim-build-$1/out/$1/generator_tool
 
 TMPDIR=../../../omim-indexer-tmp/
 
@@ -15,6 +15,6 @@ then
   PV=pv
 fi
 
-$PV ../../../omim-maps/$2.osm.bz2 | bzip2 -d | $INDEXER_TOOL --preprocess_xml=true --use_light_nodes=true --intermediate_data_path=$TMPDIR
+$PV ../../../omim-maps/$2.osm.bz2 | bzip2 -d | $GENERATOR_TOOL --preprocess_xml=true --use_light_nodes=true --intermediate_data_path=$TMPDIR
 
-$PV ../../../omim-maps/$2.osm.bz2 | bzip2 -d | $INDEXER_TOOL --use_light_nodes=true --generate_features=true --generate_geometry=true --generate_index=true --sort_features=true --intermediate_data_path=$TMPDIR --output=$2 --bucketing_level=0
+$PV ../../../omim-maps/$2.osm.bz2 | bzip2 -d | $GENERATOR_TOOL --use_light_nodes=true --generate_features=true --generate_geometry=true --generate_index=true --sort_features=true --intermediate_data_path=$TMPDIR --output=$2 --bucketing_level=0
diff --git a/tools/unix/polygons.sh b/tools/unix/polygons.sh
index 43f9796701..b14c36f06d 100755
--- a/tools/unix/polygons.sh
+++ b/tools/unix/polygons.sh
@@ -57,20 +57,20 @@ fi
 # determine script path
 MY_PATH=`dirname $0`
 
-# find indexer_tool
-IT_PATHS_ARRAY=(  "$MY_PATH/../../../omim-build-release/out/release/indexer_tool" \
-                  "$MY_PATH/../../out/release/indexer_tool" )
+# find generator_tool
+IT_PATHS_ARRAY=(  "$MY_PATH/../../../omim-build-release/out/release/generator_tool" \
+                  "$MY_PATH/../../out/release/generator_tool" )
 
 for i in {0..1}; do
   if [ -x ${IT_PATHS_ARRAY[i]} ]; then
-    INDEXER_TOOL=${IT_PATHS_ARRAY[i]}
-    echo TOOL: $INDEXER_TOOL
+    GENERATOR_TOOL=${IT_PATHS_ARRAY[i]}
+    echo TOOL: $GENERATOR_TOOL
     break
   fi
 done
 
-if [[ ! -n $INDEXER_TOOL ]]; then
-  echo 'No indexer_tool found, please build omim-build-release or omim/out/release'
+if [[ ! -n $GENERATOR_TOOL ]]; then
+  echo 'No generator_tool found, please build omim-build-release or omim/out/release'
   echo ""
   Usage
 fi
@@ -108,13 +108,13 @@ fi
 # skip 1st pass if intermediate data path was given
 if [ $# -lt 3 ]; then
   # 1st pass - not paralleled
-  $PV $OSM_BZ2 | bzip2 -d | $INDEXER_TOOL --intermediate_data_path=$TMPDIR \
+  $PV $OSM_BZ2 | bzip2 -d | $GENERATOR_TOOL --intermediate_data_path=$TMPDIR \
     --use_light_nodes=$LIGHT_NODES \
     --preprocess_xml
 fi
 
 # 2nd pass - not paralleled
-$PV $OSM_BZ2 | bzip2 -d | $INDEXER_TOOL --intermediate_data_path=$TMPDIR \
+$PV $OSM_BZ2 | bzip2 -d | $GENERATOR_TOOL --intermediate_data_path=$TMPDIR \
   --use_light_nodes=$LIGHT_NODES --split_by_polygons -simplify_countries_level=10 \
   --generate_features --generate_world_scale=6 --merge_coastlines=true \
   --data_path=$DATA_PATH
@@ -125,7 +125,7 @@ for file in $DATA_PATH/*.mwm; do
     filename=$(basename "$file")
     extension="${filename##*.}"
     filename="${filename%.*}"
-    $INDEXER_TOOL --data_path=$DATA_PATH --generate_geometry --sort_features --generate_index --output="$filename" &
+    $GENERATOR_TOOL --data_path=$DATA_PATH --generate_geometry --sort_features --generate_index --output="$filename" &
     forky $PROCESSORS
   fi
 done
diff --git a/tools/win/calc_statistics.bat b/tools/win/calc_statistics.bat
index 1a2ecc6d42..2192ad9b73 100644
--- a/tools/win/calc_statistics.bat
+++ b/tools/win/calc_statistics.bat
@@ -1,3 +1,3 @@
 call set_vars.bat %1 %2
 
-%INDEXER_TOOL% --calc_statistics=true --output=%2 --bucketing_level=0
+%GENERATOR_TOOL% --calc_statistics=true --output=%2 --bucketing_level=0
diff --git a/tools/win/gen_features.bat b/tools/win/gen_features.bat
index d3003425d2..f9bddc30b6 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% | %INDEXER_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 --bucketing_level=0
diff --git a/tools/win/gen_geometry.bat b/tools/win/gen_geometry.bat
index 48499943ad..0dd6787884 100644
--- a/tools/win/gen_geometry.bat
+++ b/tools/win/gen_geometry.bat
@@ -1,3 +1,3 @@
 call set_vars.bat %1 %2
 
-%INDEXER_TOOL% --generate_geometry=true --output=%2 --bucketing_level=0
+%GENERATOR_TOOL% --generate_geometry=true --output=%2 --bucketing_level=0
diff --git a/tools/win/gen_index.bat b/tools/win/gen_index.bat
index ddee4f37bd..48013994ec 100644
--- a/tools/win/gen_index.bat
+++ b/tools/win/gen_index.bat
@@ -1,3 +1,3 @@
 call set_vars.bat %1 %2
 
-%INDEXER_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 --bucketing_level=0
diff --git a/tools/win/process_xml.bat b/tools/win/process_xml.bat
index f22851e59c..649ae0f63d 100644
--- a/tools/win/process_xml.bat
+++ b/tools/win/process_xml.bat
@@ -1,3 +1,3 @@
 call set_vars.bat %1 %2
 
-%UNZIP_TOOL% -dc %OSM_FILE% | %INDEXER_TOOL% --preprocess_xml=true --generate_features=false --generate_geometry=false --use_light_nodes=true --generate_index=false --intermediate_data_path=D:\Temp\
+%UNZIP_TOOL% -dc %OSM_FILE% | %GENERATOR_TOOL% --preprocess_xml=true --generate_features=false --generate_geometry=false --use_light_nodes=true --generate_index=false --intermediate_data_path=D:\Temp\
diff --git a/tools/win/set_vars.bat b/tools/win/set_vars.bat
index 13865c60c4..a923424211 100644
--- a/tools/win/set_vars.bat
+++ b/tools/win/set_vars.bat
@@ -1,3 +1,3 @@
 set UNZIP_TOOL="..\bunzip2.exe"
 set OSM_FILE="D:\Temp\Osm\%2.osm.bz2"
-set INDEXER_TOOL="..\..\out\%1\indexer_tool.exe"
+set GENERATOR_TOOL="..\..\out\%1\generator_tool.exe"