Rename some shader uniforms and attributes for consistency