VP-297: Renaming some things for clarity, adding comments