Merge "Clean up commented sections to include CPS-CORE in variable names"