Fixing names of functions to what they actually do