PDI-11140 - Refactoring wrapper name