Fix namespace issue.

Syntax stuff.
Merge branch 'master' into mainMenu