Fixed a few possible errors with some of the shaders and some namespace changes.