Revert Pibrella names to original