change naming conventions