Update to final namespace layout