Remove wrap files.
Add wrap files with new names.
Add: a few minor fixes.