Variable names in shaders refactored