make obsoletes consistent