Fix use of unprefixed variables