diff --git a/gruel/src/swig/pmt_swig.i b/gruel/src/swig/pmt_swig.i
index 84f48b0..41c3fe7 100644
--- a/gruel/src/swig/pmt_swig.i
+++ b/gruel/src/swig/pmt_swig.i
@@ -43,20 +43,20 @@
 %include <stl.i>

 namespace std {
-  %template()    vector<unsigned char>;
-  %template()    vector<uint8_t>;
-  %template()    vector<char>;
-  %template()    vector<int8_t>;
-  %template()    vector<short>;
-  %template()    vector<uint16_t>;
-  %template()    vector<int16_t>;
-  %template()    vector<int>;
-  %template()    vector<int32_t>;
-  %template()    vector<uint32_t>;
-  %template()    vector<float>;
-  %template()    vector<double>;
-  %template()    vector< std::complex<float> >;
-  %template()    vector< std::complex<double> >;
+  //%template(pmt_butts_std_vector_unsigned_char)        vector<unsigned char>; //redundant
+  %template(pmt_butts_std_vector_uint8)          vector<uint8_t>;
+  %template(pmt_butts_std_vector_char)   vector<char>; //not redundant - char != uchar != schar
+  %template(pmt_butts_std_vector_int8)   vector<int8_t>;
+  //%template(pmt_butts_std_vector_short)        vector<short>; //redundant
+  %template(pmt_butts_std_vector_uint16)         vector<uint16_t>;
+  %template(pmt_butts_std_vector_int16)          vector<int16_t>;
+  //%template(pmt_butts_std_vector_int)          vector<int>; //redundant
+  %template(pmt_butts_std_vector_int32)          vector<int32_t>;
+  %template(pmt_butts_std_vector_uint32)         vector<uint32_t>;
+  %template(pmt_butts_std_vector_float)          vector<float>;
+  %template(pmt_butts_std_vector_double)         vector<double>;
+  %template(pmt_butts_std_vector_complex_float)          vector< std::complex<float> >;
+  %template(pmt_butts_std_vector_complex_double)         vector< std::complex<double> >;
 };

 ////////////////////////////////////////////////////////////////////////