Rename other refs