Use symbols for GLSL names instead of strings.
Improve shader code.
Give uniform matrices the same names in both places.