change naming convention