Fixes #6633: Smart variables and smart class parameters can not have the...

... same parameter name
This is causing failed tests, see the Jenkins output for details.