diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.cxx b/Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.cxx
index bf73dea0ec56c810f1fef70f28b4ed33d382b718..8b2d5aa57a073a4522ff569875736bb1e28da8de 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.cxx
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.cxx
@@ -66,9 +66,11 @@ void otb::ogr::Feature::PrintSelf(std::ostream & os, itk::Indent indent) const
   os << indent << "+";
   os << " " << nbFields << " fields\n";
   for (int i=0; i!=nbFields; ++i) {
+    OGRFieldDefn & field = *const_cast<Feature*>(this)->ogr().GetFieldDefnRef(i);
     os << indent << "|" << one_indent << "+ ";
-    os << const_cast<Feature*>(this)->ogr().GetFieldDefnRef(i)->GetType() << ": " // << *this
-      << "\n";
+    os << field.GetNameRef() << ": ";
+    os << "(" << OGRFieldDefn::GetFieldTypeName(field.GetType()) << ")";
+    os << "\n";
   }
 }
 
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.h b/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.h
index 1b86974620d86920378eeb33ee706617338fa093..235fda9970ae0e4d3676ca34bc766b140a9810df 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.h
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef __otbLayer_h
-#define __otbLayer_h
+#ifndef __otbLayerWrapper_h
+#define __otbLayerWrapper_h
 
 // #include <iosfwd> // std::ostream&
 #include <boost/shared_ptr.hpp>
@@ -232,7 +232,7 @@ private:
 } } // end namespace otb::ogr
 
 #ifndef OTB_MANUAL_INSTANTIATION
-// #include "otbLayer.txx"
+// #include "otbLayerWrapper.txx"
 #endif
 
-#endif // __otbLayer_h
+#endif // __otbLayerWrapper_h