[MAT-475] try flat namespace (again)