Changed bundle name to be more generic, with addition of Solaris & HP