Adapt to changes in Namespace class.

Change-Id: I0591f5c365a35a7cba9bbe446ca1569b67a5dd2f