Fixed issue with rename_vars where it wold miss some.