viewport set calls glViewport

and rename things again.