Terminology change: wrapper -> shim