Rename several functions