Added support for bundle and display names