Rename all raw pointers as necessary