diff --git a/include/aaru.h b/include/aaru.h
index 787875a..1ba1150 100644
--- a/include/aaru.h
+++ b/include/aaru.h
@@ -1087,21 +1087,21 @@ typedef struct ImageInfo
  */
 typedef enum
 {
-    AppleSectorTag        = 0,  /** Apple's GCR sector tags, 12 bytes */
-    CdSectorSync          = 1,  /** Sync frame from CD sector, 12 bytes */
-    CdSectorHeader        = 2,  /** CD sector header, 4 bytes */
-    CdSectorSubHeader     = 3,  /** CD mode 2 sector subheader */
-    CdSectorEdc           = 4,  /** CD sector EDC, 4 bytes */
-    CdSectorEccP          = 5,  /** CD sector ECC P, 172 bytes */
-    CdSectorEccQ          = 6,  /** CD sector ECC Q, 104 bytes */
-    CdSectorEcc           = 7,  /** CD sector ECC (P and Q), 276 bytes */
-    CdSectorSubchannelDic = 8,  /** CD sector subchannel, 96 bytes */
-    CdTrackIsrc           = 9,  /** CD track ISRC, string, 12 bytes */
-    CdTrackText           = 10, /** CD track text, string, 13 bytes */
-    CdTrackFlags          = 11, /** CD track flags, 1 byte */
-    DvdCmi                = 12, /** DVD sector copyright information */
-    FloppyAddressMark     = 13, /** Floppy address mark (contents depend on underlying floppy format) */
-    MaxSectorTag          = FloppyAddressMark
+    AppleSectorTag         = 0,  /** Apple's GCR sector tags, 12 bytes */
+    CdSectorSync           = 1,  /** Sync frame from CD sector, 12 bytes */
+    CdSectorHeader         = 2,  /** CD sector header, 4 bytes */
+    CdSectorSubHeader      = 3,  /** CD mode 2 sector subheader */
+    CdSectorEdc            = 4,  /** CD sector EDC, 4 bytes */
+    CdSectorEccP           = 5,  /** CD sector ECC P, 172 bytes */
+    CdSectorEccQ           = 6,  /** CD sector ECC Q, 104 bytes */
+    CdSectorEcc            = 7,  /** CD sector ECC (P and Q), 276 bytes */
+    CdSectorSubchannelAaru = 8,  /** CD sector subchannel, 96 bytes */
+    CdTrackIsrc            = 9,  /** CD track ISRC, string, 12 bytes */
+    CdTrackText            = 10, /** CD track text, string, 13 bytes */
+    CdTrackFlags           = 11, /** CD track flags, 1 byte */
+    DvdCmi                 = 12, /** DVD sector copyright information */
+    FloppyAddressMark      = 13, /** Floppy address mark (contents depend on underlying floppy format) */
+    MaxSectorTag           = FloppyAddressMark
 } SectorTagType;
 
 /*
diff --git a/include/aaruformat/context.h b/include/aaruformat/context.h
index ff44155..b6ceb0b 100644
--- a/include/aaruformat/context.h
+++ b/include/aaruformat/context.h
@@ -44,7 +44,7 @@ typedef struct aaruformatContext
     uint8_t                             libraryMajorVersion;
     uint8_t                             libraryMinorVersion;
     FILE*                               imageStream;
-    DicHeader                           header;
+    AaruHeader                          header;
     struct dataLinkedList*              mediaTagsHead;
     struct dataLinkedList*              mediaTagsTail;
     uint8_t*                            sectorPrefix;
diff --git a/include/aaruformat/enums.h b/include/aaruformat/enums.h
index 9b26d1f..0b91912 100644
--- a/include/aaruformat/enums.h
+++ b/include/aaruformat/enums.h
@@ -242,7 +242,7 @@ typedef enum
 typedef enum
 {
     AARUF_STATUS_INVALID_CONTEXT = -1,
-} DicformatStatus;
+} AaruformatStatus;
 
 /**
  *     Enumeration of media types defined in CICM metadata
diff --git a/include/aaruformat/structs.h b/include/aaruformat/structs.h
index 357ffd2..21c5052 100644
--- a/include/aaruformat/structs.h
+++ b/include/aaruformat/structs.h
@@ -44,7 +44,7 @@
 #include <stdint.h>
 
 /**Header, at start of file */
-typedef struct DicHeader
+typedef struct AaruHeader
 {
     /**Header identifier, <see cref="AARU_MAGIC" /> */
     uint64_t identifier;
@@ -66,7 +66,7 @@ typedef struct DicHeader
     int64_t creationTime;
     /**Windows filetime (100 nanoseconds since 1601/01/01 00:00:00 UTC) of image last written time */
     int64_t lastWrittenTime;
-} DicHeader;
+} AaruHeader;
 
 /**Header for a deduplication table. Table follows it */
 typedef struct DdtHeader
diff --git a/src/identify.c b/src/identify.c
index e051d09..27849db 100644
--- a/src/identify.c
+++ b/src/identify.c
@@ -67,11 +67,11 @@ int identifyStream(FILE* imageStream)
 {
     fseek(imageStream, 0, SEEK_SET);
 
-    DicHeader header;
+    AaruHeader header;
 
-    size_t ret = fread(&header, sizeof(DicHeader), 1, imageStream);
+    size_t ret = fread(&header, sizeof(AaruHeader), 1, imageStream);
 
-    if(ret < sizeof(DicHeader)) return 0;
+    if(ret < sizeof(AaruHeader)) return 0;
 
     if(header.identifier == DIC_MAGIC && header.imageMajorVersion <= AARUF_VERSION) return 100;
 
diff --git a/src/open.c b/src/open.c
index 6e65cbd..43f4929 100644
--- a/src/open.c
+++ b/src/open.c
@@ -70,9 +70,9 @@ void* open(const char* filepath)
     }
 
     fseek(ctx->imageStream, 0, SEEK_SET);
-    readBytes = fread(&ctx->header, sizeof(DicHeader), 1, ctx->imageStream);
+    readBytes = fread(&ctx->header, sizeof(AaruHeader), 1, ctx->imageStream);
 
-    if(readBytes != sizeof(DicHeader))
+    if(readBytes != sizeof(AaruHeader))
     {
         free(ctx);
         errno = AARUF_ERROR_FILE_TOO_SMALL;