Updating for new naming system