rename several functions