finish naming harmonization