More descriptive buffer macro names