fixing some refactoring leftovers (variable names)