Update variable names and references