Based on a previous commit and this commit, buffer naming should be more consistent and correct.

Added tests to insure I don't mess them up again!