Variable name adjustments