Rename constants to fix case
Added the start of ImageBuf support