Fix names for some functionalities