Unwind confusing namespace alias

Change-Id: I08d3e5f71278c7f96adb2db546da5602df84aad8