Why are we renaming these functions? If we stick the original func name, we will have less code to worry about. No?