Fixup some namespace and function name issues from recent coding convention fixes in the tree.
Fixup some namespace and function name issues from recent coding convention fixes in the tree.

billhoffman/drake,billhoffman/drake,billhoffman/drake,billhoffman/drake,sheim/drake,sheim/drake,sheim/drake,billhoffman/drake,sheim/drake,billhoffman/drake,sheim/drake,sheim/drake,billhoffman/drake,sheim/drake,sheim/drake,billhoffman/drake