Updated for new naming scheme