alignment across all files of new simpler namespace adopted