Fix short_name and display_name properties.

Refs #4973
Merge branch 'feature/property-fix-4973' into next

Fixes #4973