modifiying naming convention