Changed some Shader methods to make the naming scheme more consistent