walker: update naming conventions