Revert "moving the endpoint into buffer-name-include"

This reverts commit 36c73d2504a5765325c1b738296d01d82f374594.