hush: rename a few functions