Switched to providing uniform name for mvMatrix and pMatrix