Tweak scenario names