Update for kirkstone variable renames

No match.