Moved XObject extensions.
More rename.
And another rename
Namespace renames. Seems about done.