Improve notation of BuiltinTrancheNames