Update variable names and positioning.