Bugfix: Lots of broken variable names