Resolve #3590953 "Reduce complexity name.php"

Steven Ayersrequested to merge
issue/name-3590953:3590953-reduce-complexity-name.php into 8.x-1.x

Closes #3590953

Merge request reports