standardise on using namespace prefix in parsing

There is some ambiguity here in some places, so best to be explicit.