Reorganize and rename to be self-documenting (then update the documentation)
Reorganize and rename to be self-documenting (then update the documentation)