Changed Node reference names in several methods