Rename AvBufferX -> AvByteBufferX and create AvShortBufferX