Added new non-libxml2 tmarc. fixed naming so it matches non-libxml2/libxml2