update more var names to remove conflicts