- moved grant namespaces around to be more consistent