diff --git a/headers/os/codec/MediaExtractor.h b/headers/os/codec/MediaExtractor.h
index 7eea20345e..fe9c5621b5 100644
--- a/headers/os/codec/MediaExtractor.h
+++ b/headers/os/codec/MediaExtractor.h
@@ -26,7 +26,6 @@ struct stream_info;
 class MediaExtractor {
 public:
 								MediaExtractor(BDataIO* source, int32 flags);
-
 								~MediaExtractor();
 
 			status_t			InitCheck();
@@ -38,7 +37,7 @@ public:
 
 			status_t			GetMetaData(BMetaData* data) const;
 
-			int32				StreamCount();
+			int32				CountStreams();
 
 			const media_format*	EncodedFormat(int32 stream);
 			int64				CountFrames(int32 stream) const;
diff --git a/headers/os/codec/MetaData.h b/headers/os/codec/MetaData.h
index 3ae0387c8d..836dc012cc 100644
--- a/headers/os/codec/MetaData.h
+++ b/headers/os/codec/MetaData.h
@@ -75,8 +75,6 @@ public:
 						BMetaData(const BMessage& msg);
 	virtual				~BMetaData();
 
-						BMetaData& operator=(const BMetaData& other);
-
 	// Woah. It seems we need BValue there.
 	bool				SetString(const char* key, const BString& value);
 	bool				SetBool(const char* key, bool value);
@@ -107,6 +105,8 @@ public:
 	// that's why we need to introduce smart pointers!
 	const BMessage*		Message();
 
+	BMetaData&			operator=(const BMetaData& other);
+
 private:
 	// TODO: padding
 	BMessage*			fMessage;
diff --git a/src/kits/codec/MediaExtractor.cpp b/src/kits/codec/MediaExtractor.cpp
index 39c335de83..a7d0a5c227 100644
--- a/src/kits/codec/MediaExtractor.cpp
+++ b/src/kits/codec/MediaExtractor.cpp
@@ -209,7 +209,7 @@ MediaExtractor::GetMetaData(BMetaData* data) const
 
 
 int32
-MediaExtractor::StreamCount()
+MediaExtractor::CountStreams()
 {
 	CALLED();
 	return fStreamCount;
diff --git a/src/kits/media/MediaFile.cpp b/src/kits/media/MediaFile.cpp
index 23cfe3cb6e..364fd55269 100644
--- a/src/kits/media/MediaFile.cpp
+++ b/src/kits/media/MediaFile.cpp
@@ -540,7 +540,7 @@ BMediaFile::_InitReader(BDataIO* source, const BUrl* url, int32 flags)
 	fSource = fExtractor->Source();
 
 	fExtractor->GetFileFormatInfo(&fMFI);
-	fTrackNum = fExtractor->StreamCount();
+	fTrackNum = fExtractor->CountStreams();
 	fTrackList = (BMediaTrack**)malloc(fTrackNum * sizeof(BMediaTrack*));
 	if (fTrackList == NULL) {
 		fErr = B_NO_MEMORY;