Updated references to reflect name changes