Updated PivotPickup and some naming conventions