diff --git a/src/backend/gdi.c b/src/backend/gdi.c
index 9d403ea..7de04fd 100644
--- a/src/backend/gdi.c
+++ b/src/backend/gdi.c
@@ -375,8 +375,8 @@ MwLLPixmap MwLLCreatePixmap(MwLL handle, unsigned char* data, int width, int hei
 	HDC		 dc = GetDC(handle->hWnd);
 	BITMAPINFOHEADER bmih;
 
-	r->data_buffer = malloc(width * height * 4);
-	memcpy(r->data_buffer, data, 4 * width * height);
+	r->raw = malloc(width * height * 4);
+	memcpy(r->raw, data, 4 * width * height);
 
 	r->width  = width;
 	r->height = height;
@@ -422,7 +422,7 @@ void MwLLPixmapUpdate(MwLLPixmap r) {
 		BYTE* l2 = (BYTE*)&words2[y * (w / 2)];
 		for(x = 0; x < r->width; x++) {
 			RGBQUAD*       q  = &r->quad[y * r->width + x];
-			unsigned char* px = &r->data_buffer[(y * r->width + x) * 4];
+			unsigned char* px = &r->raw[(y * r->width + x) * 4];
 
 			q->rgbRed   = px[0];
 			q->rgbGreen = px[1];
@@ -447,7 +447,7 @@ void MwLLPixmapUpdate(MwLLPixmap r) {
 }
 
 void MwLLDestroyPixmap(MwLLPixmap pixmap) {
-	free(pixmap->data_buffer);
+	free(pixmap->raw);
 	DeleteObject(pixmap->hMask);
 	DeleteObject(pixmap->hMask2);
 	DeleteObject(pixmap->hBitmap);
diff --git a/src/backend/gdi.h b/src/backend/gdi.h
index 46f7697..4aee10c 100644
--- a/src/backend/gdi.h
+++ b/src/backend/gdi.h
@@ -45,7 +45,7 @@ struct _MwLLColor {
 struct _MwLLPixmap {
 	int	       width;
 	int	       height;
-	unsigned char* data_buffer;
+	unsigned char* raw;
 
 	RGBQUAD* quad;
 	HBITMAP	 hBitmap;
diff --git a/src/backend/x11.c b/src/backend/x11.c
index 64eaa7b..1dc36f5 100644
--- a/src/backend/x11.c
+++ b/src/backend/x11.c
@@ -437,8 +437,8 @@ MwLLPixmap MwLLCreatePixmap(MwLL handle, unsigned char* data, int width, int hei
 	int		  evbase, erbase;
 	XWindowAttributes attr;
 
-	r->data_buffer = malloc(4 * width * height);
-	memcpy(r->data_buffer, data, 4 * width * height);
+	r->raw = malloc(4 * width * height);
+	memcpy(r->raw, data, 4 * width * height);
 
 	XGetWindowAttributes(handle->display, handle->window, &attr);
 
@@ -462,7 +462,7 @@ void MwLLPixmapUpdate(MwLLPixmap r) {
 	int y, x;
 	for(y = 0; y < r->height; y++) {
 		for(x = 0; x < r->width; x++) {
-			unsigned char* px = &r->data_buffer[(y * r->width + x) * 4];
+			unsigned char* px = &r->raw[(y * r->width + x) * 4];
 			MwLLColor      c  = NULL;
 			unsigned long  p;
 
diff --git a/src/backend/x11.h b/src/backend/x11.h
index eed7d45..30d74d9 100644
--- a/src/backend/x11.h
+++ b/src/backend/x11.h
@@ -54,11 +54,10 @@ struct _MwLLColor {
 struct _MwLLPixmap {
 	int	       width;
 	int	       height;
-	unsigned char* data;
-	unsigned char* data_buffer;
+	unsigned char* raw;
 
 	int depth;
-
+	unsigned char* data;
 	MwLL	 handle;
 	int	 use_render;
 	Display* display;
diff --git a/src/draw.c b/src/draw.c
index 90979a7..04fb5c6 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -670,10 +670,10 @@ void MwReloadRaw(MwWidget handle, unsigned char* rgb, int width, int height, MwL
 	int	  i;
 	MwLLColor base = handle->bgcolor == NULL ? MwParseColor(handle, MwGetText(handle, MwNbackground)) : handle->bgcolor;
 
-	memset(px->data_buf, 0, width * height * 4);
+	memset(px->raw, 0, width * height * 4);
 	for(i = 0; i < width * height; i++) {
 		unsigned char* pin  = &rgb[i * 4];
-		unsigned char* pout = &px->data_buf[i * 4];
+		unsigned char* pout = &px->raw[i * 4];
 		double	       a    = pin[3];
 
 		a /= 255;