Namespace related changes.