diff --git a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h
index d19a2f5142..5d9d11dca8 100644
--- a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h
+++ b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.h
@@ -43,7 +43,7 @@ extern "C" {
 #endif
 
 
-class AVCodecDecoder : public Decoder {
+class AVCodecDecoder : public BDecoder {
 public:
 						AVCodecDecoder();
 
diff --git a/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp b/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp
index 1a5498f3cc..3e6615c233 100644
--- a/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp
+++ b/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp
@@ -39,7 +39,7 @@ static const size_t kDefaultChunkBufferSize = 2 * 1024 * 1024;
 
 AVCodecEncoder::AVCodecEncoder(uint32 codecID, int bitRateScale)
 	:
-	Encoder(),
+	BEncoder(),
 	fBitRateScale(bitRateScale),
 	fCodecID((CodecID)codecID),
 	fCodec(NULL),
diff --git a/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h b/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h
index 4de06fcdb1..baedbee30d 100644
--- a/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h
+++ b/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.h
@@ -20,7 +20,7 @@ extern "C" {
 typedef AVCodecID CodecID;
 
 
-class AVCodecEncoder : public Encoder {
+class AVCodecEncoder : public BEncoder {
 public:
 								AVCodecEncoder(uint32 codecID,
 									int bitRateScale);
diff --git a/src/add-ons/media/plugins/ffmpeg/AVFormatReader.h b/src/add-ons/media/plugins/ffmpeg/AVFormatReader.h
index e88b450518..5276beba47 100644
--- a/src/add-ons/media/plugins/ffmpeg/AVFormatReader.h
+++ b/src/add-ons/media/plugins/ffmpeg/AVFormatReader.h
@@ -11,7 +11,7 @@
 #include <String.h>
 
 
-class AVFormatReader : public Reader {
+class AVFormatReader : public BReader {
 public:
 								AVFormatReader();
 								~AVFormatReader();
diff --git a/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.h b/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.h
index 5d680ba355..fd25730ad7 100644
--- a/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.h
+++ b/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.h
@@ -15,7 +15,7 @@ extern "C" {
 }
 
 
-class AVFormatWriter : public Writer {
+class AVFormatWriter : public BWriter {
 public:
 								AVFormatWriter();
 								~AVFormatWriter();
diff --git a/src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.cpp b/src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.cpp
index 8e84c68b63..17ae4c48f4 100644
--- a/src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.cpp
+++ b/src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.cpp
@@ -43,7 +43,7 @@ extern "C" {
 // #pragma mark -
 
 
-Decoder*
+BDecoder*
 FFmpegPlugin::NewDecoder(uint index)
 {
 // TODO: Confirm we can check index here.
@@ -53,7 +53,7 @@ FFmpegPlugin::NewDecoder(uint index)
 }
 
 
-Reader*
+BReader*
 FFmpegPlugin::NewReader()
 {
 	return new(std::nothrow) AVFormatReader();
@@ -67,7 +67,7 @@ FFmpegPlugin::GetSupportedFormats(media_format** _formats, size_t* _count)
 }
 
 
-Writer*
+BWriter*
 FFmpegPlugin::NewWriter()
 {
 	return new(std::nothrow) AVFormatWriter();
@@ -84,7 +84,7 @@ FFmpegPlugin::GetSupportedFileFormats(const media_file_format** _fileFormats,
 }
 
 
-Encoder*
+BEncoder*
 FFmpegPlugin::NewEncoder(const media_codec_info& codecInfo)
 {
 	for (size_t i = 0; i < gEncoderCount; i++) {
@@ -97,7 +97,7 @@ FFmpegPlugin::NewEncoder(const media_codec_info& codecInfo)
 }
 
 
-Encoder*
+BEncoder*
 FFmpegPlugin::NewEncoder(const media_format& format)
 {
 	for (size_t i = 0; i < gEncoderCount; i++) {
@@ -133,7 +133,7 @@ FFmpegPlugin::RegisterNextEncoder(int32* cookie, media_codec_info* _codecInfo,
 // #pragma mark -
 
 
-MediaPlugin*
+BMediaPlugin*
 instantiate_plugin()
 {
 	return new(std::nothrow) FFmpegPlugin;
diff --git a/src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.h b/src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.h
index f7cf62c6ec..3cbdabd906 100644
--- a/src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.h
+++ b/src/add-ons/media/plugins/ffmpeg/FFmpegPlugin.h
@@ -18,24 +18,24 @@
 #include <Writer.h>
 
 
-class FFmpegPlugin : public ReaderPlugin, public DecoderPlugin,
-	public WriterPlugin, public EncoderPlugin {
+class FFmpegPlugin : public BReaderPlugin, public BDecoderPlugin,
+	public BWriterPlugin, public BEncoderPlugin {
 public:
-	virtual	Reader*				NewReader();
+	virtual	BReader*			NewReader();
 
-	virtual	Decoder*			NewDecoder(uint index);
+	virtual	BDecoder*			NewDecoder(uint index);
 	virtual	status_t			GetSupportedFormats(media_format** _formats,
 									size_t* _count);
 
-	virtual	Writer*				NewWriter();
+	virtual	BWriter*			NewWriter();
 	virtual	status_t			GetSupportedFileFormats(
 									const media_file_format** _fileFormats,
 									size_t* _count);
 
-	virtual	Encoder*			NewEncoder(
+	virtual	BEncoder*			NewEncoder(
 									const media_codec_info& codecInfo);
 
-	virtual	Encoder*			NewEncoder(const media_format& format);
+	virtual	BEncoder*			NewEncoder(const media_format& format);
 
 	virtual	status_t			RegisterNextEncoder(int32* cookie,
 									media_codec_info* codecInfo,