Change the namespace specs to be more homogeneous between files.