Fixed issues with the namespacing.