diff --git a/src/abp/abp.i b/src/abp/abp.i
index 2cd68f49..8a162261 100644
--- a/src/abp/abp.i
+++ b/src/abp/abp.i
@@ -1,7 +1,17 @@
+#ifdef SWIGPYTHON
+%module (package="upm") htu21d
+#endif
+
+%import "interfaces/new_interfaces.i"
+
 %include "../common_top.i"
 
 /* BEGIN Java syntax  ------------------------------------------------------- */
 #ifdef SWIGJAVA
+%typemap(javaimports) SWIGTYPE %{
+import upm_new_interfaces.*;
+%}
+
 JAVA_JNI_LOADLIBRARY(javaupm_abp)
 #endif
 /* END Java syntax */
@@ -10,6 +20,5 @@ JAVA_JNI_LOADLIBRARY(javaupm_abp)
 %{
 #include "abp.hpp"
 %}
-%include "interfaces/iTemperature.hpp"
 %include "abp.hpp"
 /* END Common SWIG syntax */