Fixed bug of wrongly renamed functions.