Fixing a problem with variable naming