diff --git a/libscan/font/font.c b/libscan/font/font.c
index cd0111b..c1e09a0 100644
--- a/libscan/font/font.c
+++ b/libscan/font/font.c
@@ -138,7 +138,7 @@ void bmp_format(dyn_buffer_t *buf, text_dimensions_t dimensions, const unsigned
     *(int *) ((char *) buf->buf + 2) = buf->cur;
 }
 
-void parse_font(scan_font_cxt_t *ctx, vfile_t *f, document_t *doc) {
+void parse_font(scan_font_ctx_t *ctx, vfile_t *f, document_t *doc) {
     if (ft_lib == NULL) {
         FT_Init_FreeType(&ft_lib);
     }
diff --git a/libscan/font/font.h b/libscan/font/font.h
index 8eea561..7cba62d 100644
--- a/libscan/font/font.h
+++ b/libscan/font/font.h
@@ -9,9 +9,9 @@ typedef struct {
     log_callback_t log;
     logf_callback_t logf;
     store_callback_t store;
-} scan_font_cxt_t;
+} scan_font_ctx_t;
 
-void parse_font(scan_font_cxt_t *ctx, vfile_t *f, document_t *doc);
+void parse_font(scan_font_ctx_t *ctx, vfile_t *f, document_t *doc);
 void cleanup_font();
 
 #endif
diff --git a/libscan/ooxml/ooxml.c b/libscan/ooxml/ooxml.c
index 36efdb6..a01d7ce 100644
--- a/libscan/ooxml/ooxml.c
+++ b/libscan/ooxml/ooxml.c
@@ -33,7 +33,7 @@ static int should_read_part(const char *part) {
     return FALSE;
 }
 
-int extract_text(scan_ooxml_cxt_t *ctx, xmlDoc *xml, xmlNode *node, text_buffer_t *buf) {
+int extract_text(scan_ooxml_ctx_t *ctx, xmlDoc *xml, xmlNode *node, text_buffer_t *buf) {
     //TODO: Check which nodes are likely to have a 't' child, and ignore nodes that aren't
     xmlErrorPtr err = xmlGetLastError();
     if (err != NULL) {
@@ -72,7 +72,7 @@ int xml_io_close(UNUSED(void *context)) {
 }
 
 __always_inline
-static int read_part(scan_ooxml_cxt_t *ctx, struct archive *a, text_buffer_t *buf, document_t *doc) {
+static int read_part(scan_ooxml_ctx_t *ctx, struct archive *a, text_buffer_t *buf, document_t *doc) {
 
     xmlDoc *xml = xmlReadIO(xml_io_read, xml_io_close, a, "/", NULL, XML_PARSE_RECOVER | XML_PARSE_NOWARNING | XML_PARSE_NOERROR | XML_PARSE_NONET);
 
@@ -94,7 +94,7 @@ static int read_part(scan_ooxml_cxt_t *ctx, struct archive *a, text_buffer_t *bu
     return 0;
 }
 
-void parse_doc(scan_ooxml_cxt_t *ctx, vfile_t *f, document_t *doc) {
+void parse_doc(scan_ooxml_ctx_t *ctx, vfile_t *f, document_t *doc) {
 
     size_t buf_len;
     void * buf = read_all(f, &buf_len);
diff --git a/libscan/ooxml/ooxml.h b/libscan/ooxml/ooxml.h
index 039dd02..431d1d4 100644
--- a/libscan/ooxml/ooxml.h
+++ b/libscan/ooxml/ooxml.h
@@ -9,8 +9,8 @@ typedef struct {
     log_callback_t log;
     logf_callback_t logf;
     store_callback_t store;
-} scan_ooxml_cxt_t;
+} scan_ooxml_ctx_t;
 
-void parse_doc(scan_ooxml_cxt_t *ctx, vfile_t *f, document_t *doc);
+void parse_doc(scan_ooxml_ctx_t *ctx, vfile_t *f, document_t *doc);
 
 #endif