change naming conventions for more clarity