Simplify and clarify function names and dependencies.