Bug fix caused by the previous function renaming

Several functions did not get renamed in the
previous commit. All of these have been fixed.