change in naming conventions, making things more properly