diff --git a/libavcodec/diracschro_common.c b/libavcodec/libdirac_libschro.c
similarity index 98%
rename from libavcodec/diracschro_common.c
rename to libavcodec/libdirac_libschro.c
index df2b454a7c..0b134c42e5 100644
--- a/libavcodec/diracschro_common.c
+++ b/libavcodec/libdirac_libschro.c
@@ -19,11 +19,11 @@
  */
 
 /**
-* @file diracschro_common.c
+* @file libdirac_libschro.c
 * functions common to libdirac and libschroedinger
 */
 
-#include "diracschro_common.h"
+#include "libdirac_libschro.h"
 
 static const FfmpegDiracSchroVideoFormatInfo ff_dirac_schro_video_format_info[] = {
     { 640,  480,  24000, 1001},
diff --git a/libavcodec/diracschro_common.h b/libavcodec/libdirac_libschro.h
similarity index 95%
rename from libavcodec/diracschro_common.h
rename to libavcodec/libdirac_libschro.h
index e001827b90..35fe2b1a69 100644
--- a/libavcodec/diracschro_common.h
+++ b/libavcodec/libdirac_libschro.h
@@ -19,12 +19,12 @@
  */
 
 /**
-* @file diracschro_common.h
+* @file libdirac_libschro.h
 * data structures common to libdirac and libschroedinger
 */
 
-#ifndef FFMPEG_DIRACSCHRO_COMMON_H
-#define FFMPEG_DIRACSCHRO_COMMON_H
+#ifndef FFMPEG_LIBDIRAC_LIBSCHRO_H
+#define FFMPEG_LIBDIRAC_LIBSCHRO_H
 
 #include "avcodec.h"
 
@@ -104,4 +104,4 @@ void *ff_dirac_schro_queue_pop (FfmpegDiracSchroQueue *queue);
 */
 void ff_dirac_schro_queue_free(FfmpegDiracSchroQueue *queue,
                                void (*free_func)(void *));
-#endif /* FFMPEG_DIRACSCHRO_COMMON_H */
+#endif /* FFMPEG_LIBDIRAC_LIBSCHRO_H */