Making naming of functions more consistent