Update variable names in NSC surf