diff --git a/tools/export/cdt/__init__.py b/tools/export/cdt/__init__.py
index 7b43761602..05147d07fc 100644
--- a/tools/export/cdt/__init__.py
+++ b/tools/export/cdt/__init__.py
@@ -14,7 +14,7 @@ class Eclipse(Makefile):
super(Eclipse, self).generate()
ctx = {
'name': self.project_name,
- 'elf_location': join('.build',self.project_name)+'.elf',
+ 'elf_location': join('BUILD',self.project_name)+'.elf',
'c_symbols': self.toolchain.get_symbols(),
'asm_symbols': self.toolchain.get_symbols(True),
'target': self.target,
diff --git a/tools/export/iar/__init__.py b/tools/export/iar/__init__.py
index 475f86615e..e07d7d9926 100644
--- a/tools/export/iar/__init__.py
+++ b/tools/export/iar/__init__.py
@@ -165,8 +165,11 @@ class IAR(Exporter):
os.remove(project_name + ".ewp")
os.remove(project_name + ".ewd")
os.remove(project_name + ".eww")
+ # legacy output file location
if exists('.build'):
shutil.rmtree('.build')
+ if exists('BUILD'):
+ shutil.rmtree('BUILD')
if ret_code !=0:
# Seems like something went wrong.
diff --git a/tools/export/iar/ewp.tmpl b/tools/export/iar/ewp.tmpl
index b69f6f694b..3ba5e4be8a 100644
--- a/tools/export/iar/ewp.tmpl
+++ b/tools/export/iar/ewp.tmpl
@@ -20,15 +20,15 @@