diff --git a/nifxml.py b/nifxml.py
index 9559ddb..6343515 100644
--- a/nifxml.py
+++ b/nifxml.py
@@ -1392,12 +1392,12 @@ def code_declare(self, prefix = ""): # prefix is used to tag local variables onl
         if self.arr1.lhs:
             if self.arr1.lhs.isdigit():
                 if self.arr2.lhs and self.arr2.lhs.isdigit():
-                      result = "array< %s, array<%s,%s > >"%(self.arr1.lhs, self.arr2.lhs, result)
+                      result = "NifArray< %s, NifArray<%s,%s > >"%(self.arr1.lhs, self.arr2.lhs, result)
                 else:
-                      result = "array<%s,%s >"%(self.arr1.lhs, result) 
+                      result = "NifArray<%s,%s >"%(self.arr1.lhs, result) 
             else:
                 if self.arr2.lhs and self.arr2.lhs.isdigit():
-                    result = "vector< array<%s,%s > >"%(self.arr2.lhs, result)
+                    result = "vector< NifArray<%s,%s > >"%(self.arr2.lhs, result)
                 else:
                     if self.arr2.lhs:
                         result = "vector< vector<%s > >"%result
@@ -1415,17 +1415,17 @@ def getter_declare(self, scope = "", suffix = ""):
               ltype = "%s *"%self.ctemplate
       if self.arr1.lhs:
           if self.arr1.lhs.isdigit():
-              ltype = "array<%s,%s > "%(self.arr1.lhs, ltype)
+              ltype = "NifArray<%s,%s > "%(self.arr1.lhs, ltype)
               # ltype = ltype
           else:
               if self.arr2.lhs and self.arr2.lhs.isdigit():
-                  ltype = "vector< array<%s,%s > >"%(self.arr2.lhs, ltype)
+                  ltype = "vector< NifArray<%s,%s > >"%(self.arr2.lhs, ltype)
               else:
                   ltype = "vector<%s >"%ltype
           if self.arr2.lhs:
               if self.arr2.lhs.isdigit():
                   if self.arr1.lhs.isdigit():
-                    ltype = "array<%s,%s >"%(self.arr2.lhs,ltype)
+                    ltype = "NifArray<%s,%s >"%(self.arr2.lhs,ltype)
                     # ltype = ltype
               else:
                   ltype = "vector<%s >"%ltype
@@ -1443,13 +1443,13 @@ def setter_declare(self, scope = "", suffix = ""):
           if self.arr1.lhs.isdigit():
             # ltype = "const %s&"%ltype
             if self.arr2.lhs and self.arr2.lhs.isdigit():
-                  ltype = "const array< %s, array<%s,%s > >&"%(self.arr1.lhs,self.arr2.lhs, ltype)
+                  ltype = "const NifArray< %s, NifArray<%s,%s > >&"%(self.arr1.lhs,self.arr2.lhs, ltype)
             else:
-                  ltype = "const array<%s,%s >& "%(self.arr1.lhs,ltype)              
+                  ltype = "const NifArray<%s,%s >& "%(self.arr1.lhs,ltype)              
             
           else:
               if self.arr2.lhs and self.arr2.lhs.isdigit():
-                  ltype = "const vector< array<%s,%s > >&"%(self.arr2.lhs, ltype)
+                  ltype = "const vector< NifArray<%s,%s > >&"%(self.arr2.lhs, ltype)
               else:
                   ltype = "const vector<%s >&"%ltype
       else: