PIM-1584 Fixes wrong namespace