DDF-708: Correction naming nomenclature