Replace function names with apporoved verb-noun syntax