Correct comments referencing old names