--- a/Core/Images/Image.h	Wed Sep 16 15:18:59 2015 +0200
+++ b/Core/Images/Image.h	Wed Sep 16 16:00:50 2015 +0200
@@ -40,15 +40,15 @@
   class Image : public ImageAccessor
   {
   private:
-    ImageBuffer  buffer_;
+    ImageBuffer  image_;
 
   public:
     Image(PixelFormat format,
           unsigned int width,
           unsigned int height) :
-      buffer_(format, width, height)
+      image_(format, width, height)
     {
-      ImageAccessor accessor = buffer_.GetAccessor();
+      ImageAccessor accessor = image_.GetAccessor();
       AssignWritable(format, width, height, accessor.GetPitch(), accessor.GetBuffer());
     }
   };