rename couple of functions