Fix for #4418 [may need backport]

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@35212 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Fix for #4417 + variable renaming

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@35213 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e