find/replace a few more changed variable names

fixes bug caused by f1a1f1e52f46842f4991c4d74a057fc104863d5f (WIP DHT
fixup)

emphasis on the WIP ;)

Signed-off-by: Thomas Stilwell <stilwellt@openlabs.co>
Merge pull request #442 from benemorius/triage-crashfix

find/replace a few more changed variable names