Fixing namespace layout.