diff --git a/common/rfb/tightDecode.h b/common/rfb/tightDecode.h
index e9f5f6b..fb39d99 100644
--- a/common/rfb/tightDecode.h
+++ b/common/rfb/tightDecode.h
@@ -156,7 +156,7 @@
 
   PIXEL_T *buf;
   int stride = r.width();
-  if (directDecode) buf = (PIXEL_T *)handler->getRawPixelsRW(r, &stride);
+  if (directDecode) buf = (PIXEL_T *)handler->getRawBufferRW(r, &stride);
   else buf = (PIXEL_T *)reader->getImageBuf(r.area());
 
   if (palSize == 0) {
@@ -228,7 +228,7 @@
     }
   }
 
-  if (directDecode) handler->releaseRawPixels(r);
+  if (directDecode) handler->releaseRawBuffer(r);
   else IMAGE_RECT(r, buf);
 
   delete [] netbuf;
@@ -256,10 +256,10 @@
 
   // We always use direct decoding with JPEG images
   int stride;
-  rdr::U8 *buf = handler->getRawPixelsRW(r, &stride);
+  rdr::U8 *buf = handler->getRawBufferRW(r, &stride);
   jd.decompress(netbuf, compressedLen, buf, stride * clientpf.bpp / 8, r,
                 clientpf);
-  handler->releaseRawPixels(r);
+  handler->releaseRawBuffer(r);
 
   delete [] netbuf;
 }