Some changes related to gimbal variable names