VE-861 Rename variables for consistency