Updated suite name generation