Harmonized some function call names