adjust variable names