updated to follow naming scheme