Final function renaming to follow standars