Begin move to our own namespace