Update namespace to a more common format