change a few refs around