fix obscure fn names