Issue #3471289 by sarahlorenzen: Fix the mismatch of variables in comment and twig code files.
Closes #3471289