Function name rework.

Provides a more clear function naming scheme.