Updated to use #displayname#
added getDisplayName and added code to use in files