Fixed bugs in generic variable names.