patch a few holes

function name changes