Bugfixes for variable names