Fix namespace placement

[florianMalbranque]

Place namespace under the metadata key instead of labels