This keeps the existing behavior though by mapping the expanded name to simpler
namespaces.
This also fixes some test data sample which were not properly defining their
namespace.
This will allow to deal more properly the empty body case which is incomplete
right now.
So D4067 is possible!