Adjust variable names