Rename internal functions.
Fix infinite recursion.