finalize namelessifying

Change-Id: I0368a2b7552f3391fcc1ac481ba1e2b186cf43c7