Fix comment typo.
Fix buffer-stack names.