Normalises w.r.t deprecation and namespaces