Bit of refactoring to allow easier access to find wrapper name in use (if any)