Fixed issues with the namespace movements.

Added references to Ogre and Nimbus namespaces where appropriate.