Add IDisplayName to all compnents
Make it much cleaner