Also rename variables in python files
Merge branch 'shell-fixes-2' into develop