Updates following 'Rename BitmapImage as BufferImage'