moving the endpoint into buffer-name-include