Added remaining name changes.