[Comments]: Rename some fields