Added in unique names for buffer list