Renames and use of comments for XD-707