fixed a problem with variable renaming. The problem with different constants still persists though


git-svn-id: http://gapt.googlecode.com/svn/trunk/source@1405 85d21ef8-add0-11de-ae77-5bfb9c5a3f34
fixed a small problem with regard to the previous commit


git-svn-id: http://gapt.googlecode.com/svn/trunk/source@1406 85d21ef8-add0-11de-ae77-5bfb9c5a3f34