- renamed some functions