Fixing a rename and minor comments