Adjustments to var names in logging values