diff --git a/include/FLAC/stream_decoder.h b/include/FLAC/stream_decoder.h
index 99e48a57..90d8eb22 100644
--- a/include/FLAC/stream_decoder.h
+++ b/include/FLAC/stream_decoder.h
@@ -43,22 +43,22 @@ typedef enum {
 extern const char *FLAC__StreamDecoderStateString[];
 
 typedef enum {
-	FLAC__STREAM_DECODER_READ_CONTINUE,
-	FLAC__STREAM_DECODER_READ_END_OF_STREAM,
-	FLAC__STREAM_DECODER_READ_ABORT
+	FLAC__STREAM_DECODER_READ_STATUS_CONTINUE,
+	FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM,
+	FLAC__STREAM_DECODER_READ_STATUS_ABORT
 } FLAC__StreamDecoderReadStatus;
 extern const char *FLAC__StreamDecoderReadStatusString[];
 
 typedef enum {
-	FLAC__STREAM_DECODER_WRITE_CONTINUE,
-	FLAC__STREAM_DECODER_WRITE_ABORT
+	FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE,
+	FLAC__STREAM_DECODER_WRITE_STATUS_ABORT
 } FLAC__StreamDecoderWriteStatus;
 extern const char *FLAC__StreamDecoderWriteStatusString[];
 
 typedef enum {
-	FLAC__STREAM_DECODER_ERROR_LOST_SYNC,
-	FLAC__STREAM_DECODER_ERROR_BAD_HEADER,
-	FLAC__STREAM_DECODER_ERROR_FRAME_CRC_MISMATCH
+	FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC,
+	FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER,
+	FLAC__STREAM_DECODER_ERROR_STATUS_FRAME_CRC_MISMATCH
 } FLAC__StreamDecoderErrorStatus;
 extern const char *FLAC__StreamDecoderErrorStatusString[];