Update shaders to reflect file convention changes

NOTE: More changes may be required in future