make variable names configurable, part 2