Adapt to changes in namespace class.

Change-Id: I0fe613b74acc53dbf216306167dccbef2243cfff