diff --git a/kutils/kexiv2/kexiv2.cpp b/kutils/kexiv2/kexiv2.cpp
index 338f580b..9ffd81d1 100644
--- a/kutils/kexiv2/kexiv2.cpp
+++ b/kutils/kexiv2/kexiv2.cpp
@@ -61,7 +61,7 @@ static int KExiv2Deinit()
     return 0;
 }
 Q_DESTRUCTOR_FUNCTION(KExiv2Deinit);
-#endif
+#endif // HAVE_EXIV2
 
 class KExiv2Private
 {
@@ -194,7 +194,7 @@ KExiv2::DataMap KExiv2::data() const
 #if defined(HAVE_EXIV2)
     if (d->m_exiv2image.get()) {
         try {
-            kDebug() << "Mapping Exiv2 data for" << d->m_path;
+            kDebug() << "Mapping EXIF data for" << d->m_path;
             const Exiv2::ExifData exiv2data = d->m_exiv2image->exifData();
             for (Exiv2::ExifData::const_iterator it = exiv2data.begin(); it != exiv2data.end(); it++) {
                 const std::string key = (*it).key();
diff --git a/kutils/kexiv2/kexiv2.h b/kutils/kexiv2/kexiv2.h
index 6bffd9f4..85ac5903 100644
--- a/kutils/kexiv2/kexiv2.h
+++ b/kutils/kexiv2/kexiv2.h
@@ -28,7 +28,7 @@
 class KExiv2Private;
 
 /*!
-    Class to obtain Exiv2 metadata, preview and rotate images based on the metadata.
+    Class to obtain EXIF metadata, preview and rotate images based on the metadata.
 
     @note Initialization and cleanup of the Exiv2 library resources is automatic
     @since 4.20
@@ -39,23 +39,23 @@ public:
     typedef QMap<QByteArray,QString> DataMap;
 
     /*!
-        @brief Contructs object from @p path and obtains Exiv2 data if possible
+        @brief Contructs object from @p path and obtains EXIF data if possible
     */
     KExiv2(const QString &path);
 
     /*!
-        @return Largest preview image if provided in the Exiv2 data, the image is not rotated
+        @return Largest preview image if provided in the EXIF data, the image is not rotated
         automatically and may be null
     */
     QImage preview() const;
 
     /*!
-        @return Rotates @p image according to the Exiv2 orientation data
+        @return Rotates @p image according to the EXIF orientation data
     */
     bool rotateImage(QImage &image) const;
 
     /*!
-        @return Map of all Exiv2 properties
+        @return Map of all EXIF properties
     */
     DataMap data() const;