Fixup wrongly named functions.
Cleanup b2joint and rename wrongly named fields.