Bug 880157 - Update the name if available
Merge pull request #10239 from crh0716/880157

Bug 880157 - Update the name if available