Homogenize naming convention