Change the namespace name to avoid using export c++ keyword on namespace.

Change the namespace name to avoid using export c++ keyword on namespace. #922