add fully-qualified variable names