Fix for last-minute name change