Drop non-standard <function>.name assigning
Merge branch 'function-name'