20.29 Structured Swim Workouts in TrainingPeaks all kick sets

Our team uses structured swim workouts imported to our Garmin watches from TrainingPeaks.  All of the intervals in our swim workouts built in TrainingPeaks are showing up as Kick sets (except for the initial warm up interval).  Anyone else experiencing this.  If so, has any found a solution or workaround?  We looked at creating these workouts in Garmin Connect Workout Builder, but there is no way to share these workouts. Any advice or suggestions would be greatly appreciated!