Fixes for name changes in walk primitive