Rename function to be more correct wrt to the functionality