Yes!  This was already merged with the correct naming onto develop; the xsd-fu changes need stripping out on this branch now.