diff --git a/src/upm.i b/src/upm.i
index 3f0ff031..1e32f0e0 100644
--- a/src/upm.i
+++ b/src/upm.i
@@ -3,6 +3,7 @@
 %include "upm_exception.i"
 
 %typemap(out) mraa_result_t = int;
+%apply int { speed_t };
 
 #if (SWIG_JAVASCRIPT_V8)
 %{
diff --git a/src/wt5001/javaupm_wt5001.i b/src/wt5001/javaupm_wt5001.i
index a915eb75..7fabed2d 100644
--- a/src/wt5001/javaupm_wt5001.i
+++ b/src/wt5001/javaupm_wt5001.i
@@ -1,4 +1,4 @@
-%module jacaupm_wt5001
+%module javaupm_wt5001
 %include "../upm.i"
 %include "stdint.i"
 %include "typemaps.i"