Update for kirkstone variable renames