adjust references for restructure'