Change some naming format