Replace some deprecated constants