change of naming convention