Qualify namespace

Fully qualify namespace so no need to strip namespace first.