Rename mapper to wrapper