updated to use new naming scheme