Minor tweaks to rename variables in cli code