Further namespace fixes