change naming conventions slightly