Updated script & variable names