Some minor changes in subroutine names.