Variable naming bugfix