diff --git a/python/idautils.py b/python/idautils.py
index db975dd..f8966ec 100644
--- a/python/idautils.py
+++ b/python/idautils.py
@@ -341,7 +341,7 @@ def GetInputFileMD5():
 
     @return: MD5 string or None on error
     """
-    ua=idaapi.ucharArray(16)
+    ua=idaapi.uchar_array(16)
     if idaapi.retrieve_input_file_md5(ua.cast()):
         md5str=""
         for i in range(16):
diff --git a/python/idc.py b/python/idc.py
index 637431e..50a02f0 100644
--- a/python/idc.py
+++ b/python/idc.py
@@ -1127,7 +1127,7 @@ def OpStroffEx(ea, n, strid, delta):
                     between the structure base and the pointer into the structure.
 
     """
-    path = idaapi.tidArray(1)
+    path = idaapi.tid_array(1)
     path[0] = strid
     return idaapi.op_stroff(ea, n, path.cast(), 1, delta)
 
diff --git a/swig/idaapi.i b/swig/idaapi.i
index aff16dd..431e558 100644
--- a/swig/idaapi.i
+++ b/swig/idaapi.i
@@ -67,9 +67,9 @@ typedef          long long longlong;
 // Convert all of these
 %cstring_output_maxstr_none(char *buf, size_t bufsize);
 
-%array_class(uchar, ucharArray);
-%array_class(tid_t, tidArray);
-%array_class(ea_t, eaArray);
+%array_class(uchar, uchar_array);
+%array_class(tid_t, tid_array);
+%array_class(ea_t, ea_array);
 %array_class(sel_t, sel_array);
 %pointer_class(int, int_pointer);
 %pointer_class(ea_t, ea_pointer);