Wrappers renamed to containers