Minor function name changes.