* Replaced two confusing function names