Added code to rename pointer references