diff --git a/content/media/ogg/nsOggReader.cpp b/content/media/nsBuiltinDecoderReader.cpp
similarity index 100%
rename from content/media/ogg/nsOggReader.cpp
rename to content/media/nsBuiltinDecoderReader.cpp
diff --git a/content/media/ogg/nsOggReader.h b/content/media/nsBuiltinDecoderReader.h
similarity index 100%
rename from content/media/ogg/nsOggReader.h
rename to content/media/nsBuiltinDecoderReader.h
diff --git a/content/media/ogg/nsOggPlayStateMachine.cpp b/content/media/nsBuiltinDecoderStateMachine.cpp
similarity index 100%
rename from content/media/ogg/nsOggPlayStateMachine.cpp
rename to content/media/nsBuiltinDecoderStateMachine.cpp
diff --git a/content/media/ogg/nsOggPlayStateMachine.h b/content/media/nsBuiltinDecoderStateMachine.h
similarity index 100%
rename from content/media/ogg/nsOggPlayStateMachine.h
rename to content/media/nsBuiltinDecoderStateMachine.h