fixed some semantic issues with Partner API