rename hidden functions like rest of code