Add missing "_buffer" suffix