Rename wrapper to _wrapper