Add namespace directives, add missing underscore