If the name of return_vars is the synonmin of inner dim name, change it back to inner dim name. Unit test added.