--- a/src/dmres.c	Mon Mar 02 04:01:26 2015 +0200
+++ b/src/dmres.c	Mon Mar 02 04:13:56 2015 +0200
@@ -406,12 +406,12 @@
     }
 
     // Initialize decompression structures
-    ctx.zbuffer    = inBuf;
-    ctx.zbufferEnd = inBuf + node->length;
+    ctx.inBuffer     = inBuf;
+    ctx.inBufferEnd  = inBuf + node->length;
 
-    ctx.zout       = ctx.zoutStart = handle->rawData;
-    ctx.zoutEnd    = handle->rawData + node->size;
-    ctx.expandable = FALSE;
+    ctx.outBuffer    = ctx.outBufferStart = handle->rawData;
+    ctx.outBufferEnd = handle->rawData + node->size;
+    ctx.expandable   = FALSE;
 
     // Attempt decompression
     if ((ret = dmZLibParseHeader(&ctx, TRUE)) != DMERR_OK)
@@ -420,8 +420,8 @@
     if ((ret = dmZLibDecode(&ctx)) != DMERR_OK)
         goto out;
 
-    handle->rawData = ctx.zoutStart;
-    handle->rawSize = ctx.zout - ctx.zoutStart;
+    handle->rawData = ctx.outBufferStart;
+    handle->rawSize = ctx.outBuffer - ctx.outBufferStart;
 
 out:
     dmFree(inBuf);