Update variable names to latest convention