Revert "DRY - pick up name from functions"

This reverts commit 5a1af49d5341fd9eeccd2ce1067b7771e7b633ee.
Function naming cleanup following f.name fiasco