diff --git a/src/blocks/data.c b/src/blocks/data.c
index e4f5af0..838fe01 100644
--- a/src/blocks/data.c
+++ b/src/blocks/data.c
@@ -362,7 +362,7 @@ int32_t process_data_block(aaruformat_context *ctx, IndexEntry *entry)
             break;
         case CdSectorSubchannel:
             ctx->sector_subchannel                      = data;
-            ctx->readableSectorTags[CdSectorSubchannel] = true;
+            ctx->readableSectorTags[CdSectorSubchannelAaru] = true;
             break;
         case AppleProfileTag:
         case AppleSonyTag:
diff --git a/src/read.c b/src/read.c
index 6159504..92fd600 100644
--- a/src/read.c
+++ b/src/read.c
@@ -1587,7 +1587,7 @@ AARU_EXPORT int32_t AARU_CALL aaruf_read_sector_tag(const void *context, const u
 
             FATAL("Track not found");
             return AARUF_ERROR_TRACK_NOT_FOUND;
-        case CdSectorSubchannel:
+        case CdSectorSubchannelAaru:
             if(ctx->image_info.MetadataMediaType != OpticalDisc)
             {
                 FATAL("Invalid media type for tag");
@@ -1691,7 +1691,7 @@ AARU_EXPORT int32_t AARU_CALL aaruf_read_sector_tag(const void *context, const u
             memcpy(buffer, ctx->sector_id + corrected_sector_address * 4 + 1, 3);
             TRACE("Exiting aaruf_read_sector_tag() = AARUF_STATUS_OK");
             return AARUF_STATUS_OK;
-        case DvdSectorIed:
+        case DvdSectorIedAaru:
             if(ctx->image_info.MetadataMediaType != OpticalDisc)
             {
                 FATAL("Invalid media type for tag");
@@ -1717,7 +1717,7 @@ AARU_EXPORT int32_t AARU_CALL aaruf_read_sector_tag(const void *context, const u
             memcpy(buffer, ctx->sector_ied + corrected_sector_address * 2, 2);
             TRACE("Exiting aaruf_read_sector_tag() = AARUF_STATUS_OK");
             return AARUF_STATUS_OK;
-        case DvdSectorEdc:
+        case DvdSectorEdcAaru:
             if(ctx->image_info.MetadataMediaType != OpticalDisc)
             {
                 FATAL("Invalid media type for tag");
@@ -1769,7 +1769,7 @@ AARU_EXPORT int32_t AARU_CALL aaruf_read_sector_tag(const void *context, const u
             memcpy(buffer, ctx->sector_decrypted_title_key + corrected_sector_address * 5, 5);
             TRACE("Exiting aaruf_read_sector_tag() = AARUF_STATUS_OK");
             return AARUF_STATUS_OK;
-        case AppleSonyTag:
+        case AppleSectorTag:
             if(ctx->image_info.MetadataMediaType != BlockMedia)
             {
                 FATAL("Invalid media type for tag");
diff --git a/src/write.c b/src/write.c
index 579429f..449214b 100644
--- a/src/write.c
+++ b/src/write.c
@@ -2176,7 +2176,7 @@ AARU_EXPORT int32_t AARU_CALL aaruf_write_sector_tag(void *context, const uint64
 
             FATAL("Track not found");
             return AARUF_ERROR_TRACK_NOT_FOUND;
-        case CdSectorSubchannel:
+        case CdSectorSubchannelAaru:
             if(ctx->image_info.MetadataMediaType != OpticalDisc)
             {
                 FATAL("Invalid media type for tag");
@@ -2288,7 +2288,7 @@ AARU_EXPORT int32_t AARU_CALL aaruf_write_sector_tag(void *context, const uint64
             memcpy(ctx->sector_id + corrected_sector_address * 4 + 1, data, 3);
             TRACE("Exiting aaruf_write_sector_tag() = AARUF_STATUS_OK");
             return AARUF_STATUS_OK;
-        case DvdSectorIed:
+        case DvdSectorIedAaru:
             if(ctx->image_info.MetadataMediaType != OpticalDisc)
             {
                 FATAL("Invalid media type for tag");
@@ -2316,7 +2316,7 @@ AARU_EXPORT int32_t AARU_CALL aaruf_write_sector_tag(void *context, const uint64
             memcpy(ctx->sector_ied + corrected_sector_address * 2, data, 2);
             TRACE("Exiting aaruf_write_sector_tag() = AARUF_STATUS_OK");
             return AARUF_STATUS_OK;
-        case DvdSectorEdc:
+        case DvdSectorEdcAaru:
             if(ctx->image_info.MetadataMediaType != OpticalDisc)
             {
                 FATAL("Invalid media type for tag");
@@ -2372,7 +2372,7 @@ AARU_EXPORT int32_t AARU_CALL aaruf_write_sector_tag(void *context, const uint64
             memcpy(ctx->sector_decrypted_title_key + corrected_sector_address * 5, data, 5);
             TRACE("Exiting aaruf_write_sector_tag() = AARUF_STATUS_OK");
             return AARUF_STATUS_OK;
-        case AppleSonyTag:
+        case AppleSectorTag:
             if(ctx->image_info.MetadataMediaType != BlockMedia)
             {
                 FATAL("Invalid media type for tag");