Comment and variable naming cleanup for TRQ-2208.