                 case "way_name": result += wayName
                 case "destination": result += destination
                 case "exit_number": result += exit
-                // TODO: Enable once rotary_name exposed in MBRouteStep
-                // case "rotary_name": result += step.rotaryName ?? ""
+                case "rotary_name": result += rotaryName
                 case "lane_instruction": result += laneInstruction ?? ""
                 case "modifier": result += modifierConstant
                 case "direction": result += directionFromDegree(degree: bearing)


            break
        case "rotary", "roundabout":
            // TODO: Enable once rotary_name exposed in RouteStep
            //            if step.rotaryName != nil && step.maneuverExit != nil, let nameExit = instructionObject["name_exit"] as? NSDictionary {
            //                instructionObject = nameExit
            //            } else if step.rotaryName != nil, let name = instructionObject["name"] as? NSDictionary {
            //                instructionObject = name
            if step.exitIndex != nil, let exit = instructionObject["exit"] as? NSDictionary {
                instructionObject = exit
            } else {
                instructionObject = instructionObject["default"] as! NSDictionary
            }

            break
        }

        // Set wayName
        if type?.description != "rotary" && type?.description != "roundabout" {
            let name = step.names?.first ?? ""
            let ref = step.codes?.first
            if !name.isEmpty, let ref = ref, name != ref {
                wayName = name + " (" + ref + ")";
            } else if name.isEmpty, let ref = ref {
                wayName = ref;
            } else {
                wayName = name;
            }
        }

        // Decide which instruction string to use
        // Destination takes precedence over name
        var instruction: String
        if let _ = step.destinations, let obj = instructionObject["destination"] as? String {
            instruction = obj
        } else if !wayName.isEmpty, let obj = instructionObject["name"] as? String {
            instruction = obj
        } else {
            instruction = instructionObject["default"] as! String
        }
