More synonym fixes