Unifies all the similar functions and places where they aren't used to one.
This will create a new commit in order to revert the existing changes.
