Adjustment of naming scheme Correction