diff --git a/libsrc/general/CMakeLists.txt b/libsrc/general/CMakeLists.txt
index 3f6c2aad..a9620cbc 100644
--- a/libsrc/general/CMakeLists.txt
+++ b/libsrc/general/CMakeLists.txt
@@ -2,14 +2,14 @@ add_definitions(-DNGINTERFACE_EXPORTS)
 add_library(gen INTERFACE)
 set(sdir ${CMAKE_CURRENT_SOURCE_DIR})
 target_sources(gen INTERFACE
-  ${sdir}/array.cpp ${sdir}/bitarray.cpp ${sdir}/dynamicmem.cpp ${sdir}/flags.cpp
+  ${sdir}/ngarray.cpp ${sdir}/bitarray.cpp ${sdir}/dynamicmem.cpp ${sdir}/flags.cpp
         ${sdir}/hashtabl.cpp ${sdir}/mystring.cpp ${sdir}/optmem.cpp ${sdir}/parthreads.cpp
         ${sdir}/seti.cpp ${sdir}/sort.cpp ${sdir}/spbita2d.cpp ${sdir}/table.cpp
         ${sdir}/mpi_interface.cpp ${sdir}/gzstream.cpp
         )
 
 install(FILES
-  array.hpp autodiff.hpp autoptr.hpp bitarray.hpp
+  ngarray.hpp autodiff.hpp autoptr.hpp bitarray.hpp
   dynamicmem.hpp flags.hpp hashtabl.hpp mpi_interface.hpp myadt.hpp
   ngsimd.hpp mystring.hpp netgenout.hpp ngpython.hpp
   optmem.hpp parthreads.hpp seti.hpp sort.hpp
diff --git a/libsrc/general/myadt.hpp b/libsrc/general/myadt.hpp
index 4284a42f..aac10338 100644
--- a/libsrc/general/myadt.hpp
+++ b/libsrc/general/myadt.hpp
@@ -28,7 +28,7 @@ namespace netgen
 #include "dynamicmem.hpp"
 
 #include "template.hpp"
-#include "array.hpp"
+#include "ngarray.hpp"
 #include "table.hpp"
 #include "hashtabl.hpp"
 
diff --git a/libsrc/general/array.cpp b/libsrc/general/ngarray.cpp
similarity index 94%
rename from libsrc/general/array.cpp
rename to libsrc/general/ngarray.cpp
index 3b822d1a..5078900e 100644
--- a/libsrc/general/array.cpp
+++ b/libsrc/general/ngarray.cpp
@@ -1,5 +1,5 @@
-#ifndef FILE_NGSTD_ArrayCPP
-#define FILE_NGSTD_ArrayCPP
+#ifndef FILE_NGSTD_NgArrayCPP
+#define FILE_NGSTD_NgArrayCPP
 // necessary for SGI ????
 
 /**************************************************************************/
@@ -71,5 +71,5 @@ namespace netgen
   }
 #endif
 }
-#endif
+#endif // FILE_NGSTD_NgArrayCPP
 
diff --git a/libsrc/general/array.hpp b/libsrc/general/ngarray.hpp
similarity index 99%
rename from libsrc/general/array.hpp
rename to libsrc/general/ngarray.hpp
index 345f5c44..9637e50f 100644
--- a/libsrc/general/array.hpp
+++ b/libsrc/general/ngarray.hpp
@@ -1,8 +1,8 @@
-#ifndef FILE_Array
-#define FILE_Array
+#ifndef NGARRAY_HPP_INCLUDED
+#define NGARRAY_HPP_INCLUDED
 
 /**************************************************************************/
-/* File:   array.hpp                                                      */
+/* File:   ngarray.hpp                                                    */
 /* Author: Joachim Schoeberl                                              */
 /* Date:   01. Jun. 95                                                    */
 /**************************************************************************/
@@ -795,5 +795,5 @@ namespace netgen
   }
 }
 
-#endif
+#endif // NGARRAY_HPP_INCLUDED