Rename a few refs