Namespace, comment, and contract changes.