Replace address references with named constant