fix namespacing and suppress warning