Clean up whitespace in shaders.
Fix wrong buffer being given names.: