diff --git a/include/exiv2/image.hpp b/include/exiv2/image.hpp
index 07a6e159..73edb813 100644
--- a/include/exiv2/image.hpp
+++ b/include/exiv2/image.hpp
@@ -511,8 +511,8 @@ namespace Exiv2 {
         bool              writeXmpFromPacket_;//!< Determines the source when writing XMP
         ByteOrder         byteOrder_;         //!< Byte order
 
-        std::map<int,std::string> tags;       //!< Map of tags
-        bool                      init;       //!< Flag marking if map of tags needs to be initialized
+        std::map<int,std::string> tags_;      //!< Map of tags
+        bool                      init_;      //!< Flag marking if map of tags needs to be initialized
 
     }; // class Image
 
diff --git a/src/image.cpp b/src/image.cpp
index 688adc39..9a1687e9 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -163,8 +163,8 @@ namespace Exiv2 {
           writeXmpFromPacket_(true),
 #endif
           byteOrder_(invalidByteOrder),
-          tags(),
-          init(true)
+          tags_(),
+          init_(true)
     {
     }
 
@@ -697,21 +697,21 @@ namespace Exiv2 {
 
     const std::string& Image::tagName(uint16_t tag)
     {
-        if ( init ) {
+        if ( init_ ) {
             int idx;
             const TagInfo* ti ;
-            for (ti = Internal::  mnTagList(), idx = 0; ti[idx].tag_ != 0xffff; ++idx) tags[ti[idx].tag_] = ti[idx].name_;
-            for (ti = Internal:: iopTagList(), idx = 0; ti[idx].tag_ != 0xffff; ++idx) tags[ti[idx].tag_] = ti[idx].name_;
-            for (ti = Internal:: gpsTagList(), idx = 0; ti[idx].tag_ != 0xffff; ++idx) tags[ti[idx].tag_] = ti[idx].name_;
-            for (ti = Internal:: ifdTagList(), idx = 0; ti[idx].tag_ != 0xffff; ++idx) tags[ti[idx].tag_] = ti[idx].name_;
-            for (ti = Internal::exifTagList(), idx = 0; ti[idx].tag_ != 0xffff; ++idx) tags[ti[idx].tag_] = ti[idx].name_;
-            for (ti = Internal:: mpfTagList(), idx = 0; ti[idx].tag_ != 0xffff; ++idx) tags[ti[idx].tag_] = ti[idx].name_;
+            for (ti = Internal::  mnTagList(), idx = 0; ti[idx].tag_ != 0xffff; ++idx) tags_[ti[idx].tag_] = ti[idx].name_;
+            for (ti = Internal:: iopTagList(), idx = 0; ti[idx].tag_ != 0xffff; ++idx) tags_[ti[idx].tag_] = ti[idx].name_;
+            for (ti = Internal:: gpsTagList(), idx = 0; ti[idx].tag_ != 0xffff; ++idx) tags_[ti[idx].tag_] = ti[idx].name_;
+            for (ti = Internal:: ifdTagList(), idx = 0; ti[idx].tag_ != 0xffff; ++idx) tags_[ti[idx].tag_] = ti[idx].name_;
+            for (ti = Internal::exifTagList(), idx = 0; ti[idx].tag_ != 0xffff; ++idx) tags_[ti[idx].tag_] = ti[idx].name_;
+            for (ti = Internal:: mpfTagList(), idx = 0; ti[idx].tag_ != 0xffff; ++idx) tags_[ti[idx].tag_] = ti[idx].name_;
             for (ti = Internal::Nikon1MakerNote::tagList(), idx = 0
-                                                    ; ti[idx].tag_ != 0xffff; ++idx) tags[ti[idx].tag_] = ti[idx].name_;
+                                                    ; ti[idx].tag_ != 0xffff; ++idx) tags_[ti[idx].tag_] = ti[idx].name_;
         }
-        init = false;
+        init_ = false;
 
-        return tags[tag] ;
+        return tags_[tag] ;
     }
 
     AccessMode ImageFactory::checkMode(int type, MetadataId metadataId)