Update namespace to final