more migration to new name changes