Add macgap namespacing for security.