diff --git a/src/bma250e/javaupm_bma250e.i b/src/bma250e/javaupm_bma250e.i
index 2b9d0eee..1435bfee 100644
--- a/src/bma250e/javaupm_bma250e.i
+++ b/src/bma250e/javaupm_bma250e.i
@@ -1,7 +1,7 @@
 %module javaupm_bma250e
 %include "../upm.i"
 %include "typemaps.i"
-%include "../upm_stdvector.i"
+%include "../upm_javastdvector.i"
 
 %ignore getAccelerometer(float *, float *, float *);
 
diff --git a/src/bmg160/javaupm_bmg160.i b/src/bmg160/javaupm_bmg160.i
index 6a331083..ef394217 100644
--- a/src/bmg160/javaupm_bmg160.i
+++ b/src/bmg160/javaupm_bmg160.i
@@ -1,7 +1,7 @@
 %module javaupm_bmg160
 %include "../upm.i"
 %include "typemaps.i"
-%include "../upm_stdvector.i"
+%include "../upm_javastdvector.i"
 
 %ignore getGyroscope(float *, float *, float *);
 
diff --git a/src/bmm150/javaupm_bmm150.i b/src/bmm150/javaupm_bmm150.i
index 67a7f746..bf8a285a 100644
--- a/src/bmm150/javaupm_bmm150.i
+++ b/src/bmm150/javaupm_bmm150.i
@@ -1,7 +1,7 @@
 %module javaupm_bmm150
 %include "../upm.i"
 %include "typemaps.i"
-%include "../upm_stdvector.i"
+%include "../upm_javastdvector.i"
 
 %ignore getMagnetometer(float *, float *, float *);
 
diff --git a/src/bmx055/javaupm_bmx055.i b/src/bmx055/javaupm_bmx055.i
index 0a7e1037..17ec87f1 100644
--- a/src/bmx055/javaupm_bmx055.i
+++ b/src/bmx055/javaupm_bmx055.i
@@ -2,7 +2,7 @@
 %include "../upm.i"
 %include "cpointer.i"
 %include "typemaps.i"
-%include "../upm_stdvector.i"
+%include "../upm_javastdvector.i"
 
 %apply int {mraa::Edge};
 
diff --git a/src/lsm303agr/javaupm_lsm303agr.i b/src/lsm303agr/javaupm_lsm303agr.i
index 23dc6ffd..f0c218b0 100644
--- a/src/lsm303agr/javaupm_lsm303agr.i
+++ b/src/lsm303agr/javaupm_lsm303agr.i
@@ -1,7 +1,7 @@
 %module javaupm_lsm303agr
 %include "../upm.i"
 %include "typemaps.i"
-%include "../upm_stdvector.i"
+%include "../upm_javastdvector.i"
 
 %ignore getMagnetometer(float *, float *, float *);
 %ignore getAccelerometer(float *, float *, float *);
diff --git a/src/lsm303d/javaupm_lsm303d.i b/src/lsm303d/javaupm_lsm303d.i
index 98de7c7b..399d11bc 100644
--- a/src/lsm303d/javaupm_lsm303d.i
+++ b/src/lsm303d/javaupm_lsm303d.i
@@ -1,7 +1,7 @@
 %module javaupm_lsm303d
 %include "../upm.i"
 %include "typemaps.i"
-%include "../upm_stdvector.i"
+%include "../upm_javastdvector.i"
 
 %ignore getMagnetometer(float *, float *, float *);
 %ignore getAccelerometer(float *, float *, float *);
diff --git a/src/upm_stdvector.i b/src/upm_javastdvector.i
similarity index 100%
rename from src/upm_stdvector.i
rename to src/upm_javastdvector.i