diff --git a/bindings/c/tag_c.cpp b/bindings/c/tag_c.cpp
index a12ec192..f1716069 100644
--- a/bindings/c/tag_c.cpp
+++ b/bindings/c/tag_c.cpp
@@ -431,14 +431,14 @@ void _taglib_property_set(TagLib_File *file, const char* prop, const char* value
 
 }  // namespace
 
-void taglib_property_set(TagLib_File *f, const char *prop, const char *value)
+void taglib_property_set(TagLib_File *file, const char *prop, const char *value)
 {
-  _taglib_property_set(f, prop, value, false);
+  _taglib_property_set(file, prop, value, false);
 }
 
-void taglib_property_set_append(TagLib_File *f, const char *prop, const char *value)
+void taglib_property_set_append(TagLib_File *file, const char *prop, const char *value)
 {
-  _taglib_property_set(f, prop, value, true);
+  _taglib_property_set(file, prop, value, true);
 }
 
 char** taglib_property_keys(const TagLib_File *file)
diff --git a/taglib/mpeg/id3v2/frames/ownershipframe.cpp b/taglib/mpeg/id3v2/frames/ownershipframe.cpp
index 01918b87..2d47055c 100644
--- a/taglib/mpeg/id3v2/frames/ownershipframe.cpp
+++ b/taglib/mpeg/id3v2/frames/ownershipframe.cpp
@@ -95,9 +95,9 @@ String OwnershipFrame::seller() const
   return d->seller;
 }
 
-void OwnershipFrame::setSeller(const String &s)
+void OwnershipFrame::setSeller(const String &seller)
 {
-  d->seller = s;
+  d->seller = seller;
 }
 
 String::Type OwnershipFrame::textEncoding() const
diff --git a/taglib/mpeg/id3v2/id3v2framefactory.h b/taglib/mpeg/id3v2/id3v2framefactory.h
index e4ffcb99..4f3919c8 100644
--- a/taglib/mpeg/id3v2/id3v2framefactory.h
+++ b/taglib/mpeg/id3v2/id3v2framefactory.h
@@ -73,10 +73,10 @@ namespace TagLib {
       static FrameFactory *instance();
 
       /*!
-       * Create a frame based on \a data.  \a tagHeader should be a valid
+       * Create a frame based on \a origData.  \a tagHeader should be a valid
        * ID3v2::Header instance.
        */
-      virtual Frame *createFrame(const ByteVector &data, const Header *tagHeader) const;
+      virtual Frame *createFrame(const ByteVector &origData, const Header *tagHeader) const;
 
       /*!
        * Creates a textual frame which corresponds to a single key in the
diff --git a/taglib/mpeg/id3v2/id3v2synchdata.h b/taglib/mpeg/id3v2/id3v2synchdata.h
index c91774ff..6970f733 100644
--- a/taglib/mpeg/id3v2/id3v2synchdata.h
+++ b/taglib/mpeg/id3v2/id3v2synchdata.h
@@ -62,7 +62,7 @@ namespace TagLib {
       /*!
        * Convert the data from unsynchronized data to its original format.
        */
-      TAGLIB_EXPORT ByteVector decode(const ByteVector &input);
+      TAGLIB_EXPORT ByteVector decode(const ByteVector &data);
     }  // namespace SynchData
 
   }  // namespace ID3v2
diff --git a/taglib/mpeg/id3v2/id3v2tag.h b/taglib/mpeg/id3v2/id3v2tag.h
index 929cb309..f99f6218 100644
--- a/taglib/mpeg/id3v2/id3v2tag.h
+++ b/taglib/mpeg/id3v2/id3v2tag.h
@@ -381,7 +381,7 @@ namespace TagLib {
        * This is called by read to parse the body of the tag.  It determines if an
        * extended header exists and adds frames to the FrameListMap.
        */
-      void parse(const ByteVector &data);
+      void parse(const ByteVector &origData);
 
       /*!
        * Sets the value of the text frame with the Frame ID \a id to \a value.
@@ -392,7 +392,7 @@ namespace TagLib {
       /*!
        * Downgrade frames from ID3v2.4 (used internally and by default) to ID3v2.3.
        */
-      void downgradeFrames(FrameList *existingFrames, FrameList *newFrames) const;
+      void downgradeFrames(FrameList *frames, FrameList *newFrames) const;
 
     private:
       class TagPrivate;