More config name updates