Revert "Rename package functions to function"

This reverts commit bc737ffb7d55187af48d1131b6ebbf7ae8e04e49.

Not a good idea.