homogenize naming